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

Commit 94ec9e3e 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

Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52
parents f535f810 a6e5165b

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();