diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-02-06 08:56:16 -0800 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-03-13 13:48:19 -0700 |
| commit | 493e3e7e6523fd94cc1acae3e45935a1227d58c3 (patch) | |
| tree | 74273a59209fef9ff63231a5db1a01c89c57fcc0 /packages/Keyguard/src/com | |
| parent | aea74a5977ca9f1054926eb24f247562c3a4a6ba (diff) | |
| download | frameworks_base-493e3e7e6523fd94cc1acae3e45935a1227d58c3.zip frameworks_base-493e3e7e6523fd94cc1acae3e45935a1227d58c3.tar.gz frameworks_base-493e3e7e6523fd94cc1acae3e45935a1227d58c3.tar.bz2 | |
Don't prompt at boot if we already did that when decrypting
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.
Needs matching vold changes from
https://googleplex-android-review.git.corp.google.com/#/c/432050/
Bug: 12990752
Change-Id: I930ed8180cf0b8feb1e58db043d5fb6dff1bab20
Diffstat (limited to 'packages/Keyguard/src/com')
| -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); } |