am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4': Workaround unknown ERI indices.
2011-03-14 13:34:08 -07:00
parent 816dd3d443 45660662e6
commit 9bbaa1564b
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;