diff options
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 1 | ||||
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 21 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 61d6cf5fc..df0f43700 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -794,6 +794,7 @@ public class CaptureModule implements CameraModule, PhotoController, updateFaceView(faces, null); } } + updateCaptureStateMachine(id, partialResult); } @Override diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index b05bd8ccd..6e301b51f 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -758,18 +758,19 @@ public class SettingsManager implements ListMenu.SettingsListener { } public boolean setValue(String key, String value) { - ListPreference pref = mPreferenceGroup.findPreference(key); - if (pref != null) { - if (pref.findIndexOfValue(value) < 0) { - return false; - } else { - pref.setValue(value); - updateMapAndNotify(pref); - return true; + if (mPreferenceGroup != null) { + ListPreference pref = mPreferenceGroup.findPreference(key); + if (pref != null) { + if (pref.findIndexOfValue(value) < 0) { + return false; + } else { + pref.setValue(value); + updateMapAndNotify(pref); + return true; + } } - } else { - return false; } + return false; } public boolean setValue(String key, Set<String> set) { |