diff options
| author | Yu Yang <yuyang@codeaurora.org> | 2013-09-10 16:49:33 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-10-18 13:54:24 -0700 |
| commit | 0e974f90f3526418ffed34f18cee800f90906008 (patch) | |
| tree | d85c1edbeb3151fb31e728efcf45188788d81411 | |
| parent | 1e2f0e7e5b194b24ee6eca4ffad3aef4bf5e3c66 (diff) | |
| download | android_packages_apps_Gallery2-0e974f90f3526418ffed34f18cee800f90906008.tar.gz android_packages_apps_Gallery2-0e974f90f3526418ffed34f18cee800f90906008.tar.bz2 android_packages_apps_Gallery2-0e974f90f3526418ffed34f18cee800f90906008.zip | |
Camera: Avoid the crash if fail to find value
If fail to find value, set index to 0,
which can Avoid camera crash.
Crs-fixed: 540594
Change-Id: Iedad101b8f065dbacac4b1203a378cad9c4bc62c
| -rw-r--r-- | src/com/android/camera/ListPreference.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java index bce90ccf5..9d577eef2 100644 --- a/src/com/android/camera/ListPreference.java +++ b/src/com/android/camera/ListPreference.java @@ -147,7 +147,13 @@ public class ListPreference extends CameraPreference { } public String getEntry() { - return mEntries[findIndexOfValue(getValue())].toString(); + int index = findIndexOfValue(getValue()); + // Avoid the crash if fail to find value. + if (index == -1) { + Log.e(TAG, "Fail to find value = " + getValue()); + index = 0; + } + return mEntries[index].toString(); } public String getLabel() { |