summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-05-29 01:30:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-05-29 01:30:15 -0700
commit6a3b4b5525025e414267bd5969bd231a32d96664 (patch)
tree906485575280bf4edc2e666efe765b87ed171f2b /src
parent55009371c34cc9020fe7b5cc0d3e169b23c1b6ef (diff)
parent0e2c1ccb9061158d011e8d3d39c724141f812c76 (diff)
downloadandroid_packages_apps_Snap-6a3b4b5525025e414267bd5969bd231a32d96664.tar.gz
android_packages_apps_Snap-6a3b4b5525025e414267bd5969bd231a32d96664.tar.bz2
android_packages_apps_Snap-6a3b4b5525025e414267bd5969bd231a32d96664.zip
Merge "SnapdragonCamera: Fix AE state is NULL in some scenarios" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 02d01c222..dd04d4393 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1147,7 +1147,11 @@ public class CaptureModule implements CameraModule, PhotoController,
break;
}
}
- mLastAeState = aeState;
+ if (aeState == null) {
+ mLastAeState = -1;
+ } else {
+ mLastAeState = aeState;
+ }
}
private void checkAfAeStatesAndCapture(int id) {