From 39384da05ba9ced9086dba64932878ce447c6230 Mon Sep 17 00:00:00 2001
From: Spike Sprague <spikuru@google.com>
Date: Wed, 13 Aug 2014 16:57:20 -0700
Subject: [PATCH] add a range check in MultiToggleImageButton's bitmap combine
 function.

bug: overrideImageIds
Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19
---
 src/com/android/camera/MultiToggleImageButton.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/camera/MultiToggleImageButton.java b/src/com/android/camera/MultiToggleImageButton.java
index 56e7c2dea..4ce63c472 100644
--- a/src/com/android/camera/MultiToggleImageButton.java
+++ b/src/com/android/camera/MultiToggleImageButton.java
@@ -315,6 +315,13 @@ 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.
+        // check here for that.
+        if (oldState >= mImageIds.length) {
+            return null;
+        }
+
         int width = getWidth();
         int height = getHeight();
 
-- 
2.11.0