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

* commit 'b35a21f987b99cfe90f4c46e0a708703274b8f46':
  Fix 5602985: Show "Emergency calls only" when device has no SIM.
This commit is contained in:
Jim Miller
2011-11-15 14:54:50 -08:00
committed by Android Git Automerger

View File

@@ -481,7 +481,14 @@ class KeyguardStatusViewManager implements OnClickListener {
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;