Merge "Workaround unknown ERI indices." into gingerbread

        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;