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

Commit fe4a91e6 authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

Revert "Revert "Wait until the Keyguard is drawn to dismiss the boot dialog."" 

This reverts commit 912c1a75.

Change-Id: Idf375bca0264ba0b778ad3261c4ff3d3fbfc74dc
REF: CYNGNOS-299
parent dd1e0abb

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −8
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    int[] mNavigationBarHeightForRotation = new int[4];

    int[] mNavigationBarWidthForRotation = new int[4];



    boolean mBootMessageNeedsHiding;

    KeyguardServiceDelegate mKeyguardDelegate;

    final Runnable mWindowManagerDrawCallback = new Runnable() {

        @Override
@@ -362,6 +361,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        public void onShown(IBinder windowToken) {

            if (DEBUG_WAKEUP) Slog.d(TAG, "mKeyguardDelegate.ShowListener.onShown.");

            mHandler.sendEmptyMessage(MSG_KEYGUARD_DRAWN_COMPLETE);

            hideBootMessages();

        }

    };
@@ -6197,10 +6197,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (!mKeyguardDrawnOnce && mAwake) {

                mKeyguardDrawnOnce = true;

                enableScreen = true;

                if (mBootMessageNeedsHiding) {

                    mBootMessageNeedsHiding = false;

                    hideBootMessages();

                }

            } else {

                enableScreen = false;

            }
@@ -6220,9 +6216,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    private void handleHideBootMessage() {

        synchronized (mLock) {

            if (!mKeyguardDrawnOnce) {

                mBootMessageNeedsHiding = true;

                return; // keyguard hasn't drawn the first time yet, not done booting

            if (!mKeyguardDrawComplete) {

                return; // keyguard hasn't completed drawing, not done booting.

            }

        }