Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dbefde9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CtsWindowManagerDeviceTestCases... 

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" am: d0790027 am: d6775e2d am: 6fc25007

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



Change-Id: I712bf05f4b15259eb4cb27386b79f203bcfb187b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac7d4b82 6fc25007

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

+2 −1
Original line number Diff line number Diff line
@@ -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 */);

            }