summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-22 15:57:33 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-22 15:57:33 -0800
commiteba671dc09fd92c345868655f7a20571b09d1e95 (patch)
tree6f06995344ab52ace3797d3cda589e27c927bce3
parentc6fb74a0f63210f1991686e4303ed928b23e5b4b (diff)
parent2078b9132dd8f6fe512250d2134a0b28864a1b94 (diff)
downloadandroid_packages_apps_Snap-eba671dc09fd92c345868655f7a20571b09d1e95.tar.gz
android_packages_apps_Snap-eba671dc09fd92c345868655f7a20571b09d1e95.tar.bz2
android_packages_apps_Snap-eba671dc09fd92c345868655f7a20571b09d1e95.zip
Merge "SnapdragonCamera: Do not call cancel auto focus on startup" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/PhotoModule.java6
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