summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2015-12-24 13:00:27 +0530
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-01-08 22:50:40 -0800
commita675b2cf0ebd34d180c88e43a0f38d80b22f351d (patch)
tree1ee89170b3eb00c5e751cc7c8f52e0b9d3f543d9
parent4877242757ea5ef3ae40760db95f193a44642427 (diff)
downloadandroid_packages_apps_Snap-a675b2cf0ebd34d180c88e43a0f38d80b22f351d.tar.gz
android_packages_apps_Snap-a675b2cf0ebd34d180c88e43a0f38d80b22f351d.tar.bz2
android_packages_apps_Snap-a675b2cf0ebd34d180c88e43a0f38d80b22f351d.zip
SnapdragonCamera: Restart preview in a corner case
Issue: If user sets feature.restart flag as 1, turn off ZSL,HDR 1x and capture an image with HDR, then after capture preview is not getting restarted. Fix: Set the needRestartPreview flag based on above condition. Change-Id: I4e2c9db20d5148de2b6b63288dc0d3eb75ee5a9c
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 469e5a422..52f3a8b84 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1242,6 +1242,9 @@ public class PhotoModule
&& (mSnapshotMode != CameraInfo.CAMERA_SUPPORT_MODE_ZSL)
&& ((mReceivedSnapNum == mBurstSnapNum) && (mCameraState != LONGSHOT));
needRestartPreview |= (isLongshotDone() && !mFocusManager.isZslEnabled());
+ needRestartPreview |= ((mReceivedSnapNum == mBurstSnapNum) &&
+ !mFocusManager.isZslEnabled() &&
+ CameraUtil.SCENE_MODE_HDR.equals(mSceneMode));
boolean backCameraRestartPreviewOnPictureTaken =
mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken);