diff options
| author | 2022-09-26 18:07:20 +0000 | |
|---|---|---|
| committer | 2022-09-26 18:07:20 +0000 | |
| commit | 8cfef1d29ea4931ca385a02487632a17f09d3ea6 (patch) | |
| tree | 007ac99823c304a0fcb360579d6698e9b40e9d22 | |
| parent | b6e740627814e5bb606cc45817956527b7e6c020 (diff) | |
| parent | 88f99f057ece074ea64bd11bb1b2f8a943a16c38 (diff) | |
Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" into tm-qpr-dev-plus-aosp am: 88f99f057e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20027272
Change-Id: I4e8f206e5722b7078f245643f87e9e6c3615a9f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 1eafaf0615a0..f7ce43bfb25c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -3348,7 +3348,8 @@ public class CentralSurfacesImpl extends CoreStartable implements // lock screen where users can use the UDFPS affordance to enter the device mStatusBarKeyguardViewManager.reset(true); } else if (mState == StatusBarState.KEYGUARD - && !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()) { + && !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing() + && isKeyguardSecure()) { mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */); } } |