From 299422baebe1b4c1bc2378f184b014a899dfe6ab Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 14 Nov 2013 14:15:02 -0800 Subject: [PATCH] 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 --- .../src/com/android/keyguard/KeyguardViewMediator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 3e247abc923aa..91671e5a5983f 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);