Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1

Author: Jim Miller

policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java

@@ -481,7 +481,14 @@ private void updateCarrierStateWithSimStatus(State simState) {
                 break;
 
             case SimMissing:
+                // Shows "No SIM card | Emergency calls only" on devices that are voice-capable.
+                // This depends on mPlmn containing the text "Emergency calls only" when the radio
+                // has some connectivity. Otherwise, it should be null or empty and just show
+                // "No SIM card"
                 carrierText = getContext().getText(R.string.lockscreen_missing_sim_message_short);
+                if (mLockPatternUtils.isEmergencyCallCapable()) {
+                    carrierText = makeCarierString(carrierText, mPlmn);
+                }
                 carrierHelpTextId = R.string.lockscreen_missing_sim_instructions_long;
                 break;