diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-11-04 14:56:11 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-11-04 15:01:09 -0700 |
| commit | 2078b9132dd8f6fe512250d2134a0b28864a1b94 (patch) | |
| tree | 591a46d1aa64349f2fd2f2d2d2999f0b352a2698 /src/com/android/camera/PhotoModule.java | |
| parent | 44f769c74b09f2b0413a6b2af8ad555ee66af200 (diff) | |
| download | android_packages_apps_Snap-2078b9132dd8f6fe512250d2134a0b28864a1b94.tar.gz android_packages_apps_Snap-2078b9132dd8f6fe512250d2134a0b28864a1b94.tar.bz2 android_packages_apps_Snap-2078b9132dd8f6fe512250d2134a0b28864a1b94.zip | |
SnapdragonCamera: Do not call cancel auto focus on startup
Do not call cancel_auto_focus on first time launch as it
is incorrectly signalling 3A that focus is finished.
CRs-Fixed: 1083298
Change-Id: Iaaa981ba40e4844de3469a0526934c810f1b314a
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 1851466d1..cfdd8af12 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2518,7 +2518,7 @@ public class PhotoModule private void updateRemainingPhotos() { if (mJpegFileSizeEstimation != 0) { - mRemainingPhotos = (int) + mRemainingPhotos = (int) ((mActivity.getStorageSpaceBytes() - Storage.LOW_STORAGE_THRESHOLD_BYTES) / mJpegFileSizeEstimation); } else { @@ -2971,7 +2971,7 @@ public class PhotoModule if (!mSnapshotOnIdle && !mInstantCaptureSnapShot) { // If the focus mode is continuous autofocus, call cancelAutoFocus to // resume it because it may have been paused by autoFocus call. - if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) { + if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) && mCameraState !=INIT) { mCameraDevice.cancelAutoFocus(); } } else { @@ -4965,7 +4965,7 @@ public class PhotoModule public void onErrorListener(int error) { enableRecordingLocation(false); } - + } /* Below is no longer needed, except to get rid of compile error |