summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThecrazyskull <anaskarbila@aospa.co>2016-12-23 18:08:03 -0600
committerArne Coucheron <arco68@gmail.com>2018-01-27 00:41:43 +0100
commitd90b0414e22c7f7489f16163ad9ab445c8955a32 (patch)
tree81e916978115e4ec268c59f912001f8db5111556
parentf7a65f9be424a0f2de57556d69f97cc171889a67 (diff)
downloadandroid_packages_apps_Snap-d90b0414e22c7f7489f16163ad9ab445c8955a32.tar.gz
android_packages_apps_Snap-d90b0414e22c7f7489f16163ad9ab445c8955a32.tar.bz2
android_packages_apps_Snap-d90b0414e22c7f7489f16163ad9ab445c8955a32.zip
ListPreference: prevent ArrayIndexOutOfBoundsException
* Index value is not allowed to be higher/equal to the array length Change-Id: Iff361603f337e4e77085717fce6227815ea06fc7
-rwxr-xr-xsrc/com/android/camera/ListPreference.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 05ab10f07..50afc0849 100755
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -207,6 +207,7 @@ public class ListPreference extends CameraPreference {
ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
for (int i = 0, len = mEntryValues.length; i < len; i++) {
+ if (i >= mEntries.length) break;
if (supported.indexOf(mEntryValues[i].toString()) >= 0) {
entries.add(mEntries[i]);
entryValues.add(mEntryValues[i]);