SnapdragonCamera: Fix the camera setting corruption issue

Two instances of camera preference were created and caused
the wrong preference instance is referenced when changing the
camera2 mode. Due to this, it corrupted the camera setting on
the other camera device.
To resolve the issue, create single instance of camera
preference and re-use it.

Change-Id: Ia1a6923a10b83e4c5777fb1318677c1f191942fb
CRs-fixed: 1025776

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);