Merge "Workaround unknown ERI indices." into gingerbread

2011-03-14 11:37:12 -07:00
parent 9c06c0ffc9 97ac3ef4a8
commit 45660662e6
1 changed files with 4 additions and 0 deletions
--- 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;