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

Commit ef40fb33 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Don't set keyguard state to showing when service disabled" into oc-dev 

am: 6f5328a2

Change-Id: I7bb58b1dc8e8c82f14da9c9e7e39c86509449ed5
parents 3ae16620 6f5328a2

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+8 −3
Original line number Diff line number Diff line
@@ -675,9 +675,14 @@ public class KeyguardViewMediator extends SystemUI { 
        mLockPatternUtils = new LockPatternUtils(mContext);

        KeyguardUpdateMonitor.setCurrentUser(ActivityManager.getCurrentUser());



        // Assume keyguard is showing (unless it's disabled) until we know for sure...

        setShowingLocked(!shouldWaitForProvisioning() && !mLockPatternUtils.isLockScreenDisabled(

        // Assume keyguard is showing (unless it's disabled) until we know for sure, unless Keyguard

        // is disabled.

        if (mContext.getResources().getBoolean(

                com.android.keyguard.R.bool.config_enableKeyguardService)) {

            setShowingLocked(!shouldWaitForProvisioning()

                    && !mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser()), true /* forceCallbacks */);

        }



        mStatusBarKeyguardViewManager =

                SystemUIFactory.getInstance().createStatusBarKeyguardViewManager(mContext,