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

Commit 6f5328a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5df9c557 7687aaa9

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,