Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE

Browse Source
This commit is contained in:
John Wang
2011-07-14 13:59:10 -07:00
committed by Android (Google) Code Review
parent 6d1d16c324 98c3fcc7af
commit 54b2a32627
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -690,13 +690,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
switch (simState) { switch (simState) {
case ABSENT: case ABSENT:
case PERM_DISABLED:
// only force lock screen in case of missing sim if user hasn't // only force lock screen in case of missing sim if user hasn't
// gone through setup wizard // gone through setup wizard
if (!mUpdateMonitor.isDeviceProvisioned()) { if (!mUpdateMonitor.isDeviceProvisioned()) {
if (!isShowing()) { if (!isShowing()) {
if (DEBUG) Log.d(TAG, "INTENT_VALUE_ICC_ABSENT " if (DEBUG) Log.d(TAG, "ICC_ABSENT isn't showing,"
+ "or PERM_DISABLED and keygaurd isn't showing,"
+ " we need to show the keyguard since the " + " we need to show the keyguard since the "
+ "device isn't provisioned yet."); + "device isn't provisioned yet.");
doKeyguard(); doKeyguard();
@@ -714,7 +712,17 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
} else { } else {
resetStateLocked(); resetStateLocked();
} }
break;
case PERM_DISABLED:
if (!isShowing()) {
if (DEBUG) Log.d(TAG, "PERM_DISABLED and "
+ "keygaurd isn't showing.");
doKeyguard();
} else {
if (DEBUG) Log.d(TAG, "PERM_DISABLED, resetStateLocked to"
+ "show permanently disabled message in lockscreen.");
resetStateLocked();
}
break; break;
case READY: case READY:
if (isShowing()) { if (isShowing()) {