diff options
| author | 2022-09-27 09:11:59 +0000 | |
|---|---|---|
| committer | 2022-09-27 09:11:59 +0000 | |
| commit | 2dbefde95bcc686714f8515e605c06230a82f3ef (patch) | |
| tree | e6188fcbebbd2ef5770df30f5d1f82a657267c4e | |
| parent | ac7d4b82f676701f40eb7547548b7af51d22fcc3 (diff) | |
| parent | 6fc2500747c125f1c7106c9ab13f96537ba001ce (diff) | |
Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" am: d079002768 am: d6775e2d9d am: 6fc2500747
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219764
Change-Id: I712bf05f4b15259eb4cb27386b79f203bcfb187b
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 450d0d3849d4..bf880bac4a6a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -3365,7 +3365,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()) || mState == StatusBarState.SHADE_LOCKED) { mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */); } |