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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-26 17:57:31 +00:00
committed by Android (Google) Code Review
parent 79a0ec1998 c582b3c20b
commit 88f99f057e
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

@@ -3368,7 +3368,8 @@ public class CentralSurfacesImpl extends CoreStartable implements
// lock screen where users can use the UDFPS affordance to enter the device // lock screen where users can use the UDFPS affordance to enter the device
mStatusBarKeyguardViewManager.reset(true); mStatusBarKeyguardViewManager.reset(true);
} else if (mState == StatusBarState.KEYGUARD } else if (mState == StatusBarState.KEYGUARD
&& !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()) { && !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()
&& isKeyguardSecure()) {
mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */); mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
} }
} }