diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 3dd265bb92da..e3242d13077f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -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 */); |