diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-31 07:46:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-31 07:46:31 -0700 |
| commit | 42e6654cb6af35511ee4231f324eabf34d161bcc (patch) | |
| tree | 3452b9171746ff1adcdcfc7ab2030badaf6b0c34 | |
| parent | 4421566c0d84a2ef04f8598e22822e92a134a5c1 (diff) | |
| parent | 8c0fac0e167682e3839774a47ab5bca9d0ce972c (diff) | |
| download | android_packages_apps_Snap-42e6654cb6af35511ee4231f324eabf34d161bcc.tar.gz android_packages_apps_Snap-42e6654cb6af35511ee4231f324eabf34d161bcc.tar.bz2 android_packages_apps_Snap-42e6654cb6af35511ee4231f324eabf34d161bcc.zip | |
Merge "SnapdragonCamera: fix app freeze with HDR and Macro+"
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 38280c2b1..b1aa54ae0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3488,6 +3488,22 @@ public class PhotoModule .pref_camera_advanced_feature_value_refocus_on); String optizoomOn = mActivity.getString(R.string .pref_camera_advanced_feature_value_optizoom_on); + if (refocusOn.equals(mSceneMode)) { + try { + mSceneMode = Parameters.SCENE_MODE_AUTO; + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, refocusOn); + mUI.showRefocusDialog(); + } catch (NullPointerException e) { + } + } else if (optizoomOn.equals(mSceneMode)) { + try { + mSceneMode = Parameters.SCENE_MODE_AUTO; + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, optizoomOn); + } catch (NullPointerException e) { + } + } else if (mSceneMode == null) { + mSceneMode = Parameters.SCENE_MODE_AUTO; + } if (CameraUtil.isSupported(mSceneMode, mParameters.getSupportedSceneModes())) { if (!mParameters.getSceneMode().equals(mSceneMode)) { @@ -3499,24 +3515,6 @@ public class PhotoModule mCameraDevice.setParameters(mParameters); mParameters = mCameraDevice.getParameters(); } - } else { - if (refocusOn.equals(mSceneMode)) { - try { - mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, refocusOn); - mUI.showRefocusDialog(); - } catch (NullPointerException e) { - } - } else if (optizoomOn.equals(mSceneMode)) { - try { - mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, optizoomOn); - } catch (NullPointerException e) { - } - } else { - mSceneMode = mParameters.getSceneMode(); - if (mSceneMode == null) { - mSceneMode = Parameters.SCENE_MODE_AUTO; - } - } } // Set JPEG quality. |