diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-04-01 15:12:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 15:12:17 +0000 |
| commit | d2cf756996be2cbc915227f1f384704427ab88e6 (patch) | |
| tree | b2454aed048867c7a86ee17f0ffbe86f02dc51e2 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | a11b17a7aedec700b1dd36e955370d64cbafc8ab (diff) | |
| parent | df42723d6b717fd2882c98c930a0f93c75af2474 (diff) | |
| download | frameworks_base-d2cf756996be2cbc915227f1f384704427ab88e6.zip frameworks_base-d2cf756996be2cbc915227f1f384704427ab88e6.tar.gz frameworks_base-d2cf756996be2cbc915227f1f384704427ab88e6.tar.bz2 | |
am df42723d: Merge "Don\'t double prompt on booting encrypted device"
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
Don't double prompt on booting encrypted device
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index b300bea..e0a6e67 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -932,6 +932,13 @@ public class KeyguardViewMediator { return; } + if (mLockPatternUtils.checkVoldPassword()) { + if (DEBUG) Log.d(TAG, "Not showing lock screen since just decrypted"); + // Without this, settings is not enabled until the lock screen first appears + hideLocked(); + return; + } + if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); } |