| commit | dc042fcb23bc35ed2510500934ad4ffef7586fee | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Tue Sep 26 12:18:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 12:18:13 2023 +0000 |
| tree | 44f229e207dbe2d39cbddd249df41ef99ad831de | |
| parent | 764e00e5cfdd77e754fa42f4013b0e8d85a3229c [diff] | |
| parent | 56916c44d70687e8549dda3eb73a8e385008e5be [diff] |
Merge "Ensure keyguard shows, and tells WM" into udc-qpr-dev am: 56916c44d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24829585 Change-Id: Idbe4ece3187c995e334ad1e96f191c9216cfee8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 2fe3201..1ae5d0a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -3236,7 +3236,11 @@ + "mPendingLock=" + mPendingLock + "." + "One of these being false means we re-locked the device during unlock. " + "Do not proceed to finish keyguard exit and unlock."); + doKeyguardLocked(null); finishSurfaceBehindRemoteAnimation(true /* showKeyguard */); + // Ensure WM is notified that we made a decision to show + setShowingLocked(true /* showing */, true /* force */); + return; }