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

Commit 7cca63d7 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix locked second screen on boot" into rvc-dev am: 2455e984 

Change-Id: I6c6044eddb909e120ec6987ac6da57982dcb1d9a
parents bc8883b0 2455e984

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) {