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

Commit dc042fcb authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Ensure keyguard shows, and tells WM" into udc-qpr-dev am: 56916c44 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24829585



Change-Id: Idbe4ece3187c995e334ad1e96f191c9216cfee8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 764e00e5 56916c44

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;

            }

            }