diff options
| author | Kerong Sui <ksui@codeaurora.org> | 2014-06-13 17:16:14 +0800 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-10-20 22:20:22 +0000 |
| commit | 562fcac981aea65c471355ee32c9295479697d14 (patch) | |
| tree | 62933ff05e5532a83a02a7938e4884fb4397194e | |
| parent | b4990d64a91da7ec0e3f739415e832809a362889 (diff) | |
| download | android_packages_apps_Camera2-562fcac981aea65c471355ee32c9295479697d14.tar.gz android_packages_apps_Camera2-562fcac981aea65c471355ee32c9295479697d14.tar.bz2 android_packages_apps_Camera2-562fcac981aea65c471355ee32c9295479697d14.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
| -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 54cdc275a..a3aff2d54 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2718,7 +2718,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(); |