diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2019-11-01 13:15:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-01 13:15:43 -0700 |
| commit | a94d420db6ab161ce3879d37c57be432cbb02f72 (patch) | |
| tree | e26d3bbfa2107f1d1eed655cd974cb49e15f277b /src | |
| parent | 3394ac3cf62f5277ba5c0fe2066025154d0f8bf0 (diff) | |
| parent | d07c58ce282c3e6a27d07ecb07c9f66e21f6e1ad (diff) | |
| download | android_packages_apps_Snap-a94d420db6ab161ce3879d37c57be432cbb02f72.tar.gz android_packages_apps_Snap-a94d420db6ab161ce3879d37c57be432cbb02f72.tar.bz2 android_packages_apps_Snap-a94d420db6ab161ce3879d37c57be432cbb02f72.zip | |
Merge "SnapdraongCamera: mms do not need high speed" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8aa654b21..d4db0b771 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5502,12 +5502,12 @@ public class CaptureModule implements CameraModule, PhotoController, if (mCaptureTimeLapse) { size = CameraSettings.getTimeLapseQualityFor(size); } - Bundle myExtras = intent.getExtras(); if (mMediaRecorder == null) mMediaRecorder = new MediaRecorder(); updateHFRSetting(); + mHighSpeedCapture = mHighSpeedCapture && (myExtras == null); //MMS not support high speed boolean hfr = mHighSpeedCapture && !mHighSpeedRecordingMode; if (CamcorderProfile.hasProfile(cameraId, size)) { @@ -5640,7 +5640,6 @@ public class CaptureModule implements CameraModule, PhotoController, if (requestedSizeLimit > 0 && requestedSizeLimit < maxFileSize) { maxFileSize = requestedSizeLimit; } - if (Storage.isSaveSDCard() && maxFileSize > SDCARD_SIZE_LIMIT) { maxFileSize = SDCARD_SIZE_LIMIT; } |