summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThecrazyskull <anaskarbila@aospa.co>2016-12-23 18:08:03 -0600
committerBruno Martins <bgcngm@gmail.com>2018-11-20 12:32:17 +0000
commit75fdbc3d5059e6ac5282020ac4f4a7df50865ae0 (patch)
tree10857ce82519036d76669f0b370cda5353f0942d
parent3cb2334e9c847bf88fd20a9e030bea106b144f28 (diff)
downloadandroid_packages_apps_Snap-75fdbc3d5059e6ac5282020ac4f4a7df50865ae0.tar.gz
android_packages_apps_Snap-75fdbc3d5059e6ac5282020ac4f4a7df50865ae0.tar.bz2
android_packages_apps_Snap-75fdbc3d5059e6ac5282020ac4f4a7df50865ae0.zip
ListPreference: prevent ArrayIndexOutOfBoundsException
* Index value is not allowed to be higher/equal to the array length Change-Id: Iff361603f337e4e77085717fce6227815ea06fc7
-rw-r--r--src/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 100644
--- 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]);