1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 8e28f81c9..1b0ba8e90 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -301,7 +301,11 @@ public class WideAnglePanoramaModule
         mDialogPanoramaFailedString = appRes.getString(R.string.pano_dialog_panorama_failed);
         mDialogWaitingPreviousString = appRes.getString(R.string.pano_dialog_waiting_previous);
 
-        mPreferences = new ComboPreferences(mActivity);
+        mPreferences = ComboPreferences.get(mActivity);
+        if (mPreferences == null) {
+            mPreferences = new ComboPreferences(mActivity);
+        }
+
         mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences));
         CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), activity);
         mLocationManager = new LocationManager(mActivity, null);
@@ -985,7 +989,11 @@ public class WideAnglePanoramaModule
     @Override
     public void onResumeBeforeSuper() {
         mPaused = false;
-        mPreferences = new ComboPreferences(mActivity);
+        mPreferences = ComboPreferences.get(mActivity);
+        if (mPreferences == null) {
+            mPreferences = new ComboPreferences(mActivity);
+        }
+
         CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mActivity);
         mPreferences.setLocalId(mActivity, getPreferredCameraId(mPreferences));
         CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());