diff options
| author | Camera Software Integration <camswint@localhost> | 2016-07-01 06:38:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-01 06:38:47 -0700 |
| commit | 3434de4234c215669f14d39a07747806497c535e (patch) | |
| tree | 2a3836c40165f142c8d1019c6be6a92cf744eaaa /src/com/android/camera/SettingsManager.java | |
| parent | 79a0a46a89e0c1497693fd67e6745d00274dd809 (diff) | |
| parent | f38de1f33a6fcf1b7e804617158b506e1ffa4374 (diff) | |
| download | android_packages_apps_Snap-3434de4234c215669f14d39a07747806497c535e.tar.gz android_packages_apps_Snap-3434de4234c215669f14d39a07747806497c535e.tar.bz2 android_packages_apps_Snap-3434de4234c215669f14d39a07747806497c535e.zip | |
Merge "SnapdragonCamera: Fix the camera setting corruption issue" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index ff31e9f8b..a5b72488c 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); |