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

Commit 2455e984 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix locked second screen on boot" into rvc-dev

parents 89c98762 aa4bf788

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