Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

Bug: 20957536
Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e

diff --git a/src/com/android/camera/MultiToggleImageButton.java b/src/com/android/camera/MultiToggleImageButton.java
index 8325933..34ffcef 100644 (file)
--- a/src/com/android/camera/MultiToggleImageButton.java
+++ b/src/com/android/camera/MultiToggleImageButton.java
@@ -365,10 +365,10 @@ public class MultiToggleImageButton extends ImageButton {
     }
 
     private Bitmap combine(int oldState, int newState) {
-        // in some cases, a new set of image Ids are set via overrideImageIds()
-        // and oldState overruns the array.
+        // In some cases, a new set of image Ids are set via overrideImageIds()
+        // and oldState or newState overrun the array.
         // check here for that.
-        if (oldState >= mImageIds.length) {
+        if (oldState >= mImageIds.length || newState >= mImageIds.length) {
             return null;
         }