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

Commit 2531d137 authored by Matt Pietal's avatar Matt Pietal
Browse files

Tweak bouncer showing on swipe up 

There is still an edge case that is needed
for SIMs

Fixes: 343327511
Test: manual - race condition when hitting power after
using UDFPS to unlock after tapping notification, test
with sim relocking
Flag: com.android.systemui.relock_with_power_button_immediately

Change-Id: Icf2ceb8f08cea1e13d859adfc719557d49b64ae1
parent dc6e3c33

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

+8 −3
Original line number Diff line number Diff line
@@ -2365,9 +2365,14 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                // lock screen where users can use the UDFPS affordance to enter the device

                mStatusBarKeyguardViewManager.reset(true);

            } else if (mState == StatusBarState.KEYGUARD

                    && !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()

                    && mStatusBarKeyguardViewManager.isSecure()) {

                if (!relockWithPowerButtonImmediately()) {

                    && !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()) {

                boolean needsBouncer = mStatusBarKeyguardViewManager.isSecure();

                if (relockWithPowerButtonImmediately()) {

                    // Only request if SIM bouncer is needed

                    needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();

                }



                if (needsBouncer) {

                    Log.d(TAG, "showBouncerOrLockScreenIfKeyguard, showingBouncer");

                    if (SceneContainerFlag.isEnabled()) {

                        mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */);