Merge "Fix locked second screen on boot" into rvc-dev am: 2455e98420 am: 09960b9491 am: a6d309d001 (bfc8b2d2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -126,12 +126,14 @@ public class KeyguardDisplayManager {
		final int displayId = display.getDisplayId();
		Presentation presentation = mPresentations.get(displayId);
		if (presentation == null) {
		presentation = new KeyguardPresentation(mContext, display, mInjectableInflater);
		presentation.setOnDismissListener(dialog -> {
		if (null != mPresentations.get(displayId)) {
		final Presentation newPresentation =
		new KeyguardPresentation(mContext, display, mInjectableInflater);
		newPresentation.setOnDismissListener(dialog -> {
		if (newPresentation.equals(mPresentations.get(displayId))) {
		mPresentations.remove(displayId);
		}
		});
		presentation = newPresentation;
		try {
		presentation.show();
		} catch (WindowManager.InvalidDisplayException ex) {