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

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

am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits... 

am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev

* commit '09abd164':
  Fix problem where PhoneWindowManager waits for keyguard to draw
parents 272b0929 09abd164

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

+12 −1
Original line number Diff line number Diff line
@@ -431,7 +431,18 @@ public class KeyguardViewManager { 
    public synchronized void onScreenTurnedOn(final IKeyguardShowCallback callback) {

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

        mScreenOn = true;

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

        final IBinder token;



        // If keyguard is disabled, 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();

        }



        if (mKeyguardView != null) {

            mKeyguardView.onScreenTurnedOn();