am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev

* commit '90fa53318d4984dbebfa7964ae1f79f51a130932':
  Don't show keyguard until the device has been provisioned.

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);