summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index deab80e01..f8e5981af 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -542,7 +542,10 @@ public class PhotoModule
}
public void reinit() {
- mPreferences = new ComboPreferences(mActivity);
+ mPreferences = ComboPreferences.get(mActivity);
+ if (mPreferences == null) {
+ mPreferences = new ComboPreferences(mActivity);
+ }
CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity);
mCameraId = getPreferredCameraId(mPreferences);
mPreferences.setLocalId(mActivity, mCameraId);
@@ -553,7 +556,11 @@ public class PhotoModule
public void init(CameraActivity activity, View parent) {
mActivity = activity;
mRootView = parent;
- mPreferences = new ComboPreferences(mActivity);
+ mPreferences = ComboPreferences.get(mActivity);
+ if (mPreferences == null) {
+ mPreferences = new ComboPreferences(mActivity);
+ }
+
CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity);
mCameraId = getPreferredCameraId(mPreferences);
mContentResolver = mActivity.getContentResolver();