diff options
| author | Michael W <baddaemon87@gmail.com> | 2016-10-22 13:12:46 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-11-04 13:18:32 -0700 |
| commit | 1809088d44af9a6100fe80e5fd28492c79bfb1b7 (patch) | |
| tree | 0876bdf573f94b79ec77eb2780964de5711d6032 | |
| parent | 7c9beb765b60e156202175cc3840d0f7c36979f3 (diff) | |
| download | android_packages_apps_Snap-1809088d44af9a6100fe80e5fd28492c79bfb1b7.tar.gz android_packages_apps_Snap-1809088d44af9a6100fe80e5fd28492c79bfb1b7.tar.bz2 android_packages_apps_Snap-1809088d44af9a6100fe80e5fd28492c79bfb1b7.zip | |
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.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 667025303..8cfd369b8 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 { |