diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-24 13:32:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-24 13:32:00 -0700 |
| commit | cf218e90bf998ceae03beb11bb4a333149e3b5bd (patch) | |
| tree | fa4ef93c6c641547130b62b768de6b9f07e6e348 | |
| parent | 2ca7c4006facbc4a8f3d5ca5dc693c299226f48f (diff) | |
| parent | 58827dbca65281406cff610fbfda890fbbf17d7b (diff) | |
| download | android_packages_apps_Snap-cf218e90bf998ceae03beb11bb4a333149e3b5bd.tar.gz android_packages_apps_Snap-cf218e90bf998ceae03beb11bb4a333149e3b5bd.tar.bz2 android_packages_apps_Snap-cf218e90bf998ceae03beb11bb4a333149e3b5bd.zip | |
Merge "SnapdragonCamera: Fix setValue in SettingsManager" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 41ce09379..3d93a3ee8 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -437,11 +437,18 @@ public class SettingsManager implements ListMenu.SettingsListener { return values.overriddenValue != null; } - public void setValue(String key, String value) { + public boolean setValue(String key, String value) { ListPreference pref = mPreferenceGroup.findPreference(key); if (pref != null) { - pref.setValue(value); - updateMapAndNotify(pref); + if (pref.findIndexOfValue(value) < 0) { + return false; + } else { + pref.setValue(value); + updateMapAndNotify(pref); + return true; + } + } else { + return false; } } |