summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2016-10-22 11:12:46 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-04 20:15:06 (GMT)
commitbeec60c940e6a50046d4c7c469b9381492f8b77a (patch)
tree256eb99bdbdcc6b59d2ccc7130ac99a2710e0705
parent832a6b06aad4ecd3f2c0817c071958ce64b1d04f (diff)
downloadandroid_packages_apps_Snap-beec60c940e6a50046d4c7c469b9381492f8b77a.zip
android_packages_apps_Snap-beec60c940e6a50046d4c7c469b9381492f8b77a.tar.gz
android_packages_apps_Snap-beec60c940e6a50046d4c7c469b9381492f8b77a.tar.bz2
Snap: Fix possible RuntimeException (due to NPE)
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
-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 054db5d..4744ae2 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -427,7 +427,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 {