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

Commit 56916c44 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Ensure keyguard shows, and tells WM" into udc-qpr-dev

parents c59dfa40 2434ff8f

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -3236,7 +3236,11 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                        + "mPendingLock=" + mPendingLock + "."

                        + "mPendingLock=" + mPendingLock + "."

                        + "One of these being false means we re-locked the device during unlock. "

                        + "One of these being false means we re-locked the device during unlock. "

                        + "Do not proceed to finish keyguard exit and unlock.");

                        + "Do not proceed to finish keyguard exit and unlock.");

                doKeyguardLocked(null);

                finishSurfaceBehindRemoteAnimation(true /* showKeyguard */);

                finishSurfaceBehindRemoteAnimation(true /* showKeyguard */);

                // Ensure WM is notified that we made a decision to show

                setShowingLocked(true /* showing */, true /* force */);



                return;

                return;

            }

            }