diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-14 14:15:02 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2013-11-14 14:15:02 -0800 |
| commit | 299422baebe1b4c1bc2378f184b014a899dfe6ab (patch) | |
| tree | 0d949828042b2ec9989bb482d2e568b2b7b36b6a | |
| parent | 24fe066ee2ea6d6ea9e30e6f323dad6960c24177 (diff) | |
| download | base-299422baebe1b4c1bc2378f184b014a899dfe6ab.tar.gz | |
Don't show keyguard until the device has been provisioned.
This fixes a bug where we'd show keyguard on top of setup.
Fixes bug 11689756
Change-Id: I38ecdafc00fc34fdd79e3ac517042a1e5eea93de
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 3e247abc923a..91671e5a5983 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -509,7 +509,8 @@ public class KeyguardViewMediator { mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER); // Assume keyguard is showing (unless it's disabled) until we know for sure... - mShowing = !mLockPatternUtils.isLockScreenDisabled(); + mShowing = (mUpdateMonitor.isDeviceProvisioned() || mLockPatternUtils.isSecure()) + && !mLockPatternUtils.isLockScreenDisabled(); WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE); |