Merge "Don't show keyguard until the device has been provisioned." into klp-dev

2013-11-14 23:34:32 +00:00
parent 99437f252b 299422baeb
commit 90fa53318d
1 changed files with 2 additions and 1 deletions
--- 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);