diff options
author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 18:33:11 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:38:50 -0600 |
commit | 6a09224d997a0379e81df542630395ef6ff3ff3e (patch) | |
tree | c1ed02452e9a683225d781894ee7ceefaf8d4c51 /src/com/android/camera/ListPreference.java | |
parent | 2bc105d994f64f048aa18c33e97faa5740ba333c (diff) | |
download | android_packages_apps_Snap-6a09224d997a0379e81df542630395ef6ff3ff3e.tar.gz android_packages_apps_Snap-6a09224d997a0379e81df542630395ef6ff3ff3e.tar.bz2 android_packages_apps_Snap-6a09224d997a0379e81df542630395ef6ff3ff3e.zip |
Camera: Use default value in case new value is not supported
- Instead of throwing exception in case of new value is not supported,
just use the default one
- The scenario for fixed issue is:
1. Start back camera
2. Select some scene mode that doesn't overwrite focus mode
3. Go to video mode
4. Switch to front camera (focus mode is change to continuous video
automatically, based on supported values)
5. Switch to back camera (focus mode is still video)
6. Switch to image mode (focus mode continuous is still selected,
but not supported for image)
(cherry picked from 3d5393822990a36e6723657ab7807d1aa15f5fb9 )
Change-Id: I0512cb1db6c6fdda826d88a22642bff911b68d2d
(cherry picked from commit b70466eba25662171f209164392489ab147ac5f9)
(cherry picked from commit f871072244ce7d429266ff916319361cbfb6b837)
(cherry picked from commit 63fd837bf89903e2e9e472ba4aa56bdd584020b2)
Diffstat (limited to 'src/com/android/camera/ListPreference.java')
-rw-r--r-- | src/com/android/camera/ListPreference.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index 34040d79b..40f9bfe74 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -127,7 +127,9 @@ public class ListPreference extends CameraPreference { } public void setValue(String value) { - if (findIndexOfValue(value) < 0) throw new IllegalArgumentException(); + if (findIndexOfValue(value) < 0) { + value = findSupportedDefaultValue(); + } mValue = value; persistStringValue(value); } |