diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-03-26 23:43:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-26 23:43:32 +0000 |
| commit | 96a6b115c16076fac50002aea551e97523bc7de2 (patch) | |
| tree | 40846bd62404389f4a26d1e0f047f847d001f2b5 /packages/Keyguard | |
| parent | 933297fcb0bf1c344ba2800bae24c5991d1f1c77 (diff) | |
| parent | 6ee7d25010d4f23b44a151f3953225ba253de8af (diff) | |
| download | frameworks_base-96a6b115c16076fac50002aea551e97523bc7de2.zip frameworks_base-96a6b115c16076fac50002aea551e97523bc7de2.tar.gz frameworks_base-96a6b115c16076fac50002aea551e97523bc7de2.tar.bz2 | |
am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decrypting"
* commit '6ee7d25010d4f23b44a151f3953225ba253de8af':
Revert "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, 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); } |