summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2016-10-22 11:12:46 (GMT)
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-11-04 20:18:32 (GMT)
commit1809088d44af9a6100fe80e5fd28492c79bfb1b7 (patch)
tree0876bdf573f94b79ec77eb2780964de5711d6032
parent7c9beb765b60e156202175cc3840d0f7c36979f3 (diff)
downloadandroid_packages_apps_Snap-cm-14.0.zip
android_packages_apps_Snap-cm-14.0.tar.gz
android_packages_apps_Snap-cm-14.0.tar.bz2
Snap: Fix possible RuntimeException (due to NPE)cm-14.0
When the pref can't be found, index "-1" is returned, causing an NPE resulting in an RTE. Add check for a positive index before accessing the array Change-Id: Ifa80077c2090a9df449be608feaf4390c875ff0f Reference: BugDumps 13-20161014-20 L#40 (cherry picked from commit beec60c940e6a50046d4c7c469b9381492f8b77a)
-rw-r--r--src/com/android/camera/VideoMenu.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 6670253..8cfd369 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -430,7 +430,7 @@ public class VideoMenu extends MenuController
int[] iconIds = pref.getLargeIconIds();
int resid = -1;
int index = pref.findIndexOfValue(pref.getValue());
- if (!pref.getUseSingleIcon() && iconIds != null) {
+ if (!pref.getUseSingleIcon() && iconIds != null && index >= 0) {
// Each entry has a corresponding icon.
resid = iconIds[index];
} else {