am 5266ca5c: am 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

* commit '5266ca5cdbb0a024449769317e09a441e13e6ddf':
  Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/camera/MultiToggleImageButton.java b/src/com/android/camera/MultiToggleImageButton.java
index 8325933dd..34ffcefbe 100644
--- 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;
         }