diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-03-26 22:09:24 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-03-26 22:31:04 +0000 |
| commit | 6ee7d25010d4f23b44a151f3953225ba253de8af (patch) | |
| tree | 824a39171f6e1cb2489720f9323360658a4bf1e0 /packages/Keyguard/src/com/android | |
| parent | 36d242898bdc39baee6427ce7aded751d43c34d6 (diff) | |
| download | frameworks_base-6ee7d25010d4f23b44a151f3953225ba253de8af.zip frameworks_base-6ee7d25010d4f23b44a151f3953225ba253de8af.tar.gz frameworks_base-6ee7d25010d4f23b44a151f3953225ba253de8af.tar.bz2 | |
Revert "Don't prompt at boot if we already did that when decrypting"
This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.
Should fixes
Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
Diffstat (limited to 'packages/Keyguard/src/com/android')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 3fc562c..31e806c 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -979,13 +979,6 @@ 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); } |