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

Commit b7ae1990 authored by Bart Sears's avatar Bart Sears Committed by Android Git Automerger
Browse files

am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev 

* commit 'bd29b07e':
  Fix Keyguard drawn timeout
parents ac9fbe9d bd29b07e

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -5493,10 +5493,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // may happen in a future call to goToSleep.

        // may happen in a future call to goToSleep.

        synchronized (mLock) {

        synchronized (mLock) {

            mAwake = true;

            mAwake = true;

            if (mKeyguardDelegate != null) {

                mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);

                mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);

            }





            updateWakeGestureListenerLp();

            updateWakeGestureListenerLp();

            updateOrientationListenerLp();

            updateOrientationListenerLp();
@@ -5586,6 +5582,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            mScreenOnListener = screenOnListener;

            mScreenOnListener = screenOnListener;





            if (mKeyguardDelegate != null) {

            if (mKeyguardDelegate != null) {

                mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);

                mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);

                mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback);

                mKeyguardDelegate.onScreenTurningOn(mKeyguardDrawnCallback);

            } else {

            } else {

                if (DEBUG_WAKEUP) Slog.d(TAG,

                if (DEBUG_WAKEUP) Slog.d(TAG,