From 97ac3ef4a87a2ea4aeef246bc13e23f8600619f9 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Fri, 11 Mar 2011 09:25:36 -0500
Subject: [PATCH] Workaround unknown ERI indices.

Bug: 4075878
Change-Id: I18b793ebccbd1332e3e153acca34056d26bf10a0
---
 .../src/com/android/systemui/statusbar/StatusBarPolicy.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
index a4789a18813ca..adcf8d1daec95 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 @@ public class StatusBarPolicy {
 
         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;