Merge change 5165 into donut
* changes: When the sim is missing, show "press menu to unlock or place emergency call" on lock screen instead of just "press menu to unlock".
This commit is contained in:
@@ -227,7 +227,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
|
||||
|
||||
private void refreshUnlockIntructions() {
|
||||
if (mLockPatternUtils.isLockPatternEnabled()
|
||||
|| mUpdateMonitor.getSimState() == IccCard.State.PIN_REQUIRED) {
|
||||
|| mUpdateMonitor.getSimState() == IccCard.State.PIN_REQUIRED
|
||||
|| mUpdateMonitor.getSimState() == IccCard.State.ABSENT) {
|
||||
mLockInstructions.setText(R.string.lockscreen_instructions_when_pattern_enabled);
|
||||
} else {
|
||||
mLockInstructions.setText(R.string.lockscreen_instructions_when_pattern_disabled);
|
||||
@@ -327,6 +328,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
|
||||
public void onSimStateChanged(IccCard.State simState) {
|
||||
mSimOk = isSimOk(simState);
|
||||
refreshViewsWRTSimOk();
|
||||
refreshUnlockIntructions();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user