diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-04-01 15:07:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-01 15:07:10 +0000 |
| commit | df42723d6b717fd2882c98c930a0f93c75af2474 (patch) | |
| tree | 130cca07cc92b207ffa58fa2c08f5e9879afa27e /packages | |
| parent | 779b0eea300509ef072a8aa043a3c486d565110b (diff) | |
| parent | 945490c12e32b1c13b9097c00702558260b2011f (diff) | |
| download | frameworks_base-df42723d6b717fd2882c98c930a0f93c75af2474.zip frameworks_base-df42723d6b717fd2882c98c930a0f93c75af2474.tar.gz frameworks_base-df42723d6b717fd2882c98c930a0f93c75af2474.tar.bz2 | |
Merge "Don't double prompt on booting encrypted device"
Diffstat (limited to 'packages')
| -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 c3aa47f..354d13f 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -981,6 +981,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); } |