summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/ListPreference.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index b856d460e..1abda7c48 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -151,11 +151,19 @@ public class ListPreference extends CameraPreference {
}
public String getEntry() {
- return mEntries[findIndexOfValue(getValue())].toString();
+ int index = findIndexOfValue(getValue());
+ if (index < 0) {
+ index = findIndexOfValue(findSupportedDefaultValue());
+ }
+ return mEntries[index].toString();
}
public String getLabel() {
- return mLabels[findIndexOfValue(getValue())].toString();
+ int index = findIndexOfValue(getValue());
+ if (index < 0) {
+ index = findIndexOfValue(findSupportedDefaultValue());
+ }
+ return mLabels[index].toString();
}
protected void persistStringValue(String value) {