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

am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0

Browse Source 
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
This commit is contained in:
Jim Miller
2011-11-01 07:49:46 +00:00
committed by Android Git Automerger
parent 11ba6da460 1dce37bd6b
commit 2272602032
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,8 +616,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
final IccCard.State state = mUpdateMonitor.getSimState();
final boolean lockedOrMissing = state.isPinLocked()
|| ((state == IccCard.State.ABSENT
|| state == IccCard.State.PERM_DISABLED)
&& requireSim);
|| state == IccCard.State.PERM_DISABLED)
&& requireSim);
if (!lockedOrMissing && !provisioned) {
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because device isn't provisioned"
@@ -625,7 +625,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
return;
}
if (mLockPatternUtils.isLockScreenDisabled()) {
if (mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) {
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off");
return;
}