diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-09-22 13:34:14 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-10-13 11:12:45 -0700 |
| commit | 2322edc10db67d084edf03bb6b522911f2893318 (patch) | |
| tree | d8a1ad0893c97e1fbeb7bfc3e4f29f6633df2a49 /src/com/android/camera/PanoCaptureUI.java | |
| parent | 00e82ced33ad0248c41f6e0423c80cb6d1604a51 (diff) | |
| download | android_packages_apps_Snap-2322edc10db67d084edf03bb6b522911f2893318.tar.gz android_packages_apps_Snap-2322edc10db67d084edf03bb6b522911f2893318.tar.bz2 android_packages_apps_Snap-2322edc10db67d084edf03bb6b522911f2893318.zip | |
SnapdragonCamera: Panorama2 fix
1. Checking if setting manager instance null on closing.
2. Counting in the lens mount orientation value
Change-Id: Ib33819ca91b665768601d8195b3e0afb5a3c88c1
CRs-Fixed: 1071798
Diffstat (limited to 'src/com/android/camera/PanoCaptureUI.java')
| -rw-r--r-- | src/com/android/camera/PanoCaptureUI.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PanoCaptureUI.java b/src/com/android/camera/PanoCaptureUI.java index 256647ad0..127feef84 100644 --- a/src/com/android/camera/PanoCaptureUI.java +++ b/src/com/android/camera/PanoCaptureUI.java @@ -337,7 +337,9 @@ public class PanoCaptureUI implements mCameraControls.getPanoramaExitButton().setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - SettingsManager.getInstance().setValueIndex(SettingsManager.KEY_SCENE_MODE, SettingsManager.SCENE_MODE_AUTO_INT); + try { + SettingsManager.getInstance().setValueIndex(SettingsManager.KEY_SCENE_MODE, SettingsManager.SCENE_MODE_AUTO_INT); + } catch(NullPointerException e) {} mActivity.onModuleSelected(ModuleSwitcher.CAPTURE_MODULE_INDEX); } }); |