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

Commit a6e5165b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Gerrit Code Review
Browse files

Merge "Don't wait keyguard drawn if device has no keyguard"

parents ab5bc3be 0df686d2

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

+1 −1
Original line number Diff line number Diff line
@@ -6791,7 +6791,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
@@ -235,6 +235,10 @@ public class KeyguardServiceDelegate { 
        return false;

    }



    public boolean hasKeyguard() {

        return mKeyguardState.deviceHasKeyguard;

    }



    public boolean isInputRestricted() {

        if (mKeyguardService != null) {

            mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted();