Revert "Wait until the Keyguard is drawn to dismiss the boot dialog." (912c1a75) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -348,6 +348,7 @@ 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
		@@ -361,7 +362,6 @@ 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();
		}
		};

		@@ -6124,6 +6124,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (!mKeyguardDrawnOnce && mAwake) {
		mKeyguardDrawnOnce = true;
		enableScreen = true;
		if (mBootMessageNeedsHiding) {
		mBootMessageNeedsHiding = false;
		hideBootMessages();
		}
		} else {
		enableScreen = false;
		}
		@@ -6143,8 +6147,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		private void handleHideBootMessage() {
		synchronized (mLock) {
		if (!mKeyguardDrawComplete) {
		return; // keyguard hasn't completed drawing, not done booting.
		if (!mKeyguardDrawnOnce) {
		mBootMessageNeedsHiding = true;
		return; // keyguard hasn't drawn the first time yet, not done booting
		}
		}