Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29d1201d authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am dab5ba58: am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the... 

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

* commit 'dab5ba58':
  Don't show keyguard until the device has been provisioned.
parents 63e1883d dab5ba58

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

+2 −1
Original line number Diff line number Diff line
@@ -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);