diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-03-21 13:45:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 13:45:20 -0700 |
| commit | 81d63c442bf25b09fbc1b0408484f6153597ad3e (patch) | |
| tree | a15af6d589d0aa437af4630ba485881947c00885 /packages/Keyguard | |
| parent | db73678e770950a026bd620e681c355041c0de4e (diff) | |
| parent | 717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7 (diff) | |
| download | frameworks_base-81d63c442bf25b09fbc1b0408484f6153597ad3e.zip frameworks_base-81d63c442bf25b09fbc1b0408484f6153597ad3e.tar.gz frameworks_base-81d63c442bf25b09fbc1b0408484f6153597ad3e.tar.bz2 | |
am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 31e806c..3fc562c 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -979,6 +979,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); } |