1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index cc7523265..bd9322b4d 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -104,7 +104,10 @@ public class SettingsManager implements ListMenu.SettingsListener {
         mListeners = new ArrayList<>();
         mCharacteristics = new ArrayList<>();
         mContext = context;
-        mPreferences = new ComboPreferences(mContext);
+        mPreferences = ComboPreferences.get(mContext);
+        if (mPreferences == null) {
+            mPreferences = new ComboPreferences(mContext);
+        }
         CameraSettings.upgradeGlobalPreferences(mPreferences.getGlobal(), mContext);
 
         CameraManager manager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);