Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" into tm-qpr-dev-plus-aosp am: 88f99f057e

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2022-09-26 18:07:20 +00:00
committed by Automerger Merge Worker
parent b6e7406278 88f99f057e
commit 8cfef1d29e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
View File

@@ -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 */);
}
}