diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-25 14:47:59 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-25 14:47:59 -0700 |
commit | e2388509dfb0feb3fc326c283018e2711d218bad (patch) | |
tree | 6ca3edeb0a8eeaa49f111039282622fb070bb4e4 /src/com/android/camera/SettingsManager.java | |
parent | e3d899eaa76b143410ac3047d4fc3c0edeb2e13b (diff) | |
parent | 54718277469d05cf7e45703bad283d26a40115c6 (diff) | |
download | android_packages_apps_Snap-e2388509dfb0feb3fc326c283018e2711d218bad.tar.gz android_packages_apps_Snap-e2388509dfb0feb3fc326c283018e2711d218bad.tar.bz2 android_packages_apps_Snap-e2388509dfb0feb3fc326c283018e2711d218bad.zip |
Merge "SnapdragonCamera:Add intent interface for APT automation" 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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index c8f3f8c7b..e2057660c 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -428,8 +428,10 @@ public class SettingsManager implements ListMenu.SettingsListener { public void setValue(String key, String value) { ListPreference pref = mPreferenceGroup.findPreference(key); - pref.setValue(value); - updateMapAndNotify(pref); + if (pref != null) { + pref.setValue(value); + updateMapAndNotify(pref); + } } public void setValueIndex(String key, int index) { |