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" am: d079002768

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219764

Change-Id: Ibd15dc5199faff57c58a1ea823d308af67032a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-27 08:16:46 +00:00
committed by Automerger Merge Worker
parent 3eb2dc4a12 d079002768
commit d6775e2d9d
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

@@ -3384,7 +3384,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())
|| mState == StatusBarState.SHADE_LOCKED) { || mState == StatusBarState.SHADE_LOCKED) {
mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */); mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
} }