diff options
| author | Kerong Sui <ksui@codeaurora.org> | 2014-06-13 17:16:14 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-17 20:27:43 -0700 |
| commit | 7333d20f5275a350171a4c4cc7c7a28e01e44a21 (patch) | |
| tree | c035cd17161651f660685e8feb511839eda9397f /src | |
| parent | 58b31f9123f2060a2ea8726a9176129dca554b34 (diff) | |
| download | android_packages_apps_Snap-7333d20f5275a350171a4c4cc7c7a28e01e44a21.tar.gz android_packages_apps_Snap-7333d20f5275a350171a4c4cc7c7a28e01e44a21.tar.bz2 android_packages_apps_Snap-7333d20f5275a350171a4c4cc7c7a28e01e44a21.zip | |
Camera2: fix start preview when hdr is on issue
when we have already set hdr on and do not set off, we don't need
to set it to scene mode to auto every time. This will make the camerea
to start preview again, which will make the app freeze for a while
Change-Id: Ica77106b88056e289cd298eda4ccc5c3f4f6ab59
CRs-Fixed: 679200
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 0b94e2592..1ebe6806e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2854,7 +2854,8 @@ public class PhotoModule } else { if (hdrOn) { mSceneMode = CameraUtil.SCENE_MODE_HDR; - if (!(Parameters.SCENE_MODE_AUTO).equals(mParameters.getSceneMode())) { + if (!(Parameters.SCENE_MODE_AUTO).equals(mParameters.getSceneMode()) + && !(Parameters.SCENE_MODE_HDR).equals(mParameters.getSceneMode())) { mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO); mCameraDevice.setParameters(mParameters); mParameters = mCameraDevice.getParameters(); |