diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2016-02-17 10:03:37 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2018-11-20 12:31:35 +0000 |
| commit | 46d6f072c196fe19dc6ae03ca7b651a63c603409 (patch) | |
| tree | ef0b8adca8301cce15df50a881a559a11c1c20bd /src/com | |
| parent | 8363f00c7d8ec3819d01e980f800d4b63042cb8c (diff) | |
| download | android_packages_apps_Snap-46d6f072c196fe19dc6ae03ca7b651a63c603409.tar.gz android_packages_apps_Snap-46d6f072c196fe19dc6ae03ca7b651a63c603409.tar.bz2 android_packages_apps_Snap-46d6f072c196fe19dc6ae03ca7b651a63c603409.zip | |
Snap: Don't crash if user saved preference is not valid
If the user sets some preference value that is later removed, Snap will
crash because of on an ArrayIndexOutOfBoundsException. Make sure this
doesn't happen.
Change-Id: I629acebaf762f49f05dc1bfa0542f11979ae269d
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index ae37356e1..05ab10f07 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -184,7 +184,11 @@ public class ListPreference extends CameraPreference { } public String getLabel() { - return mLabels[findIndexOfValue(getValue())].toString(); + int index = findIndexOfValue(getValue()); + if (index < 0) { + return findSupportedDefaultValue(); + } + return mLabels[index].toString(); } protected void persistStringValue(String value) { |