commit 97ac3ef4a87a2ea4aeef246bc13e23f8600619f9
author Daniel Sandler <dsandler@android.com> Fri Mar 11 09:25:36 2011 -0500
committer Daniel Sandler <dsandler@android.com> Mon Mar 14 14:35:06 2011 -0400
tree 19f611b16fdc693ba149f65eef94d4eb15d63567
parent 68f66b945e7a69549689becd2e656d9056f1e7f5

Workaround unknown ERI indices.

Bug: 4075878
Change-Id: I18b793ebccbd1332e3e153acca34056d26bf10a0

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index a4789a1..adcf8d1d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
@@ -1243,6 +1243,10 @@
 
         switch (iconMode) {
             case EriInfo.ROAMING_ICON_MODE_NORMAL:
+                if (iconIndex >= iconList.length) {
+                    Slog.e(TAG, "unknown iconIndex " + iconIndex + ", skipping ERI icon update");
+                    return;
+                }
                 mService.setIcon("cdma_eri", iconList[iconIndex], 0);
                 mService.setIconVisibility("cdma_eri", true);
                 break;