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

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

Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b am: 94ec9e3e 

am: 239d74fa

Change-Id: I19abbe828a0004888143be02fd6ca834d8013a64
parents 6dcc9de2 239d74fa

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -6705,7 +6705,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            mWindowManagerDrawComplete = false;

            mScreenOnListener = screenOnListener;



            if (mKeyguardDelegate != null) {

            if (mKeyguardDelegate != null && mKeyguardDelegate.hasKeyguard()) {

                mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);

                mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT,

                        getKeyguardDrawnTimeout());

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ public class KeyguardServiceDelegate { 
        return false;

    }



    public boolean hasKeyguard() {

        return mKeyguardState.deviceHasKeyguard;

    }



    public boolean isInputRestricted() {

        if (mKeyguardService != null) {

            mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted();