diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f6cd60ba5..4d311bad3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -539,6 +539,9 @@ public class PhotoModule } private void onPreviewStarted() { + if (mCameraState == SNAPSHOT_IN_PROGRESS) { + return; + } mUI.hidePreviewCover(); setCameraState(IDLE); mFocusManager.onPreviewStarted(); @@ -3115,7 +3118,7 @@ public class PhotoModule String auto_hdr = mPreferences.getString(CameraSettings.KEY_AUTO_HDR, mActivity.getString(R.string.pref_camera_hdr_default)); if (CameraUtil.isAutoHDRSupported(mParameters)) { - mParameters.setAutoHDRMode(auto_hdr); + mParameters.set("auto-hdr-enable",auto_hdr); if (auto_hdr.equals("enable")) { mActivity.runOnUiThread(new Runnable() { public void run() { |