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

Commit 805f7a1d authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am a4738bdb: am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports... 

am a4738bdb: am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev

* commit 'a4738bdb':
  Fix issue where keyguard reports a valid token but doesn't draw
parents c9cc6907 a4738bdb

packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

+5 −9
Original line number Diff line number Diff line
@@ -431,17 +431,13 @@ public class KeyguardViewManager { 
    public synchronized void onScreenTurnedOn(final IKeyguardShowCallback callback) {

        if (DEBUG) Log.d(TAG, "onScreenTurnedOn()");

        mScreenOn = true;

        final IBinder token;



        // If keyguard is disabled, we need to inform PhoneWindowManager with a null

        // If keyguard is not showing, we need to inform PhoneWindowManager with a null

        // token so it doesn't wait for us to draw...

        final boolean disabled =

                mLockPatternUtils.isLockScreenDisabled() && !mLockPatternUtils.isSecure();

        if (mKeyguardHost == null || disabled) {

            token = null;

        } else {

            token = mKeyguardHost.getWindowToken();

        }

        final IBinder token = isShowing() ? mKeyguardHost.getWindowToken() : null;



        if (DEBUG && token == null) Slog.v(TAG, "send wm null token: "

                + (mKeyguardHost == null ? "host was null" : "not showing"));



        if (mKeyguardView != null) {

            mKeyguardView.onScreenTurnedOn();