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

am 9dda10c3: am 876b0644: Fix 2555028: Restore showing tab unlock before PIN & password entry.

Browse Source
This commit is contained in:
Jim Miller
2010-03-30 18:26:22 -07:00
committed by Android Git Automerger
parent e09826c6d3 fc8686b9ec
commit 85cbee09db
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
policy/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -640,10 +640,15 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
final IccCard.State simState = mUpdateMonitor.getSimState();
if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) {
return Mode.LockScreen;
} else if (isSecure()) {
return Mode.UnlockScreen;
} else {
return Mode.LockScreen;
// Show LockScreen first for any screen other than Pattern unlock.
final boolean usingLockPattern = mLockPatternUtils.getKeyguardStoredPasswordQuality()
== DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
if (isSecure() && usingLockPattern) {
return Mode.UnlockScreen;
} else {
return Mode.LockScreen;
}
}
}