diff options
| author | likaid <likaid@codeaurora.org> | 2015-03-03 11:54:03 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-08 20:15:30 -0700 |
| commit | df546f6a0b2665d0bbf4ec76387334f6d7fac09b (patch) | |
| tree | 19a4f82f15eefb52d2ccd21915c317c4b56a7474 | |
| parent | 22c2e38daad6854315c6abad634e87c3d367fa9b (diff) | |
| download | android_packages_apps_Snap-df546f6a0b2665d0bbf4ec76387334f6d7fac09b.tar.gz android_packages_apps_Snap-df546f6a0b2665d0bbf4ec76387334f6d7fac09b.tar.bz2 android_packages_apps_Snap-df546f6a0b2665d0bbf4ec76387334f6d7fac09b.zip | |
SnapdragonCamera: fix camera FC when internal storage isn't enough
The menu may be not initialized when switch save path in PhotoModule.
Check the menu initialized state before switch save path.
Change-Id: Ibdc8d5510924b45f5abfc13f4d70dcf9620c8b7d
CRs-Fixed: 801619
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index da1c80c8c..4e2296808 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -795,7 +795,13 @@ public class PhotoModule @Override public void onSwitchSavePath() { - mUI.setPreference(CameraSettings.KEY_CAMERA_SAVEPATH, "1"); + if (mUI.mMenuInitialized) { + mUI.setPreference(CameraSettings.KEY_CAMERA_SAVEPATH, "1"); + } else { + mPreferences.edit() + .putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1") + .apply(); + } RotateTextToast.makeText(mActivity, R.string.on_switch_save_path_to_sdcard, Toast.LENGTH_SHORT).show(); } diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 812bc4305..a40152681 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -932,7 +932,7 @@ public class WideAnglePanoramaModule @Override public void onSwitchSavePath() { - mPreferences.edit().putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1").apply(); + mPreferences.getGlobal().edit().putString(CameraSettings.KEY_CAMERA_SAVEPATH, "1").apply(); RotateTextToast.makeText(mActivity, R.string.on_switch_save_path_to_sdcard, Toast.LENGTH_SHORT).show(); } |