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

Commit e5b5a4c9 authored by Matt Pietal's avatar Matt Pietal
Browse files

Issue resets to the SIM bouncer 

This was removed somewhat recently, due to falsing concerns.
When the user rapidly the touches the screen, it will
flicker. However, that fix broke legitimate cases
such as when a new SIM message comes in that requires
the bouncer to update.

Test: atest StatusBarKeyguardViewManagerTest
Fixes: 342949122
Flag: EXEMPT bugfix

Change-Id: I8c5d14331e3187114bee360dcf8246fe22b52fb1
parent ad1fb534

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2995,7 +2995,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                @Override

                @Override

                public void onFalse() {

                public void onFalse() {

                    // Hides quick settings, bouncer, and quick-quick settings.

                    // Hides quick settings, bouncer, and quick-quick settings.

                    mStatusBarKeyguardViewManager.reset(true);

                    mStatusBarKeyguardViewManager.reset(true, /* isFalsingReset= */true);

                }

                }

            };

            };

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

+12 −4
Original line number Original line Diff line number Diff line
@@ -708,7 +708,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
     * Shows the notification keyguard or the bouncer depending on

     * Shows the notification keyguard or the bouncer depending on

     * {@link #needsFullscreenBouncer()}.

     * {@link #needsFullscreenBouncer()}.

     */

     */

    protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing) {

    protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing, boolean isFalsingReset) {

        boolean isDozing = mDozing;

        boolean isDozing = mDozing;

        if (Flags.simPinRaceConditionOnRestart()) {

        if (Flags.simPinRaceConditionOnRestart()) {

            KeyguardState toState = mKeyguardTransitionInteractor.getTransitionState().getValue()

            KeyguardState toState = mKeyguardTransitionInteractor.getTransitionState().getValue()
@@ -734,8 +734,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                        mPrimaryBouncerInteractor.show(/* isScrimmed= */ true);

                        mPrimaryBouncerInteractor.show(/* isScrimmed= */ true);

                    }

                    }

                }

                }

            } else {

            } else if (!isFalsingReset) {

                Log.e(TAG, "Attempted to show the sim bouncer when it is already showing.");

                // Falsing resets can cause this to flicker, so don't reset in this case

                Log.i(TAG, "Sim bouncer is already showing, issuing a refresh");

                mPrimaryBouncerInteractor.hide();

                mPrimaryBouncerInteractor.show(/* isScrimmed= */ true);



            }

            }

        } else {

        } else {

            mCentralSurfaces.showKeyguard();

            mCentralSurfaces.showKeyguard();
@@ -957,6 +961,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 




    @Override

    @Override

    public void reset(boolean hideBouncerWhenShowing) {

    public void reset(boolean hideBouncerWhenShowing) {

        reset(hideBouncerWhenShowing, /* isFalsingReset= */false);

    }



    public void reset(boolean hideBouncerWhenShowing, boolean isFalsingReset) {

        if (mKeyguardStateController.isShowing() && !bouncerIsAnimatingAway()) {

        if (mKeyguardStateController.isShowing() && !bouncerIsAnimatingAway()) {

            final boolean isOccluded = mKeyguardStateController.isOccluded();

            final boolean isOccluded = mKeyguardStateController.isOccluded();

            // Hide quick settings.

            // Hide quick settings.
@@ -968,7 +976,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                    hideBouncer(false /* destroyView */);

                    hideBouncer(false /* destroyView */);

                }

                }

            } else {

            } else {

                showBouncerOrKeyguard(hideBouncerWhenShowing);

                showBouncerOrKeyguard(hideBouncerWhenShowing, isFalsingReset);

            }

            }

            if (hideBouncerWhenShowing) {

            if (hideBouncerWhenShowing) {

                hideAlternateBouncer(true);

                hideAlternateBouncer(true);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+18 −3
Original line number Original line Diff line number Diff line
@@ -1068,7 +1068,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    public void testShowBouncerOrKeyguard_needsFullScreen() {

    public void testShowBouncerOrKeyguard_needsFullScreen() {

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

                KeyguardSecurityModel.SecurityMode.SimPin);

                KeyguardSecurityModel.SecurityMode.SimPin);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false, false);

        verify(mCentralSurfaces).hideKeyguard();

        verify(mCentralSurfaces).hideKeyguard();

        verify(mPrimaryBouncerInteractor).show(true);

        verify(mPrimaryBouncerInteractor).show(true);

    }

    }
@@ -1084,7 +1084,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
                .thenReturn(KeyguardState.LOCKSCREEN);

                .thenReturn(KeyguardState.LOCKSCREEN);





        reset(mCentralSurfaces);

        reset(mCentralSurfaces);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false, false);

        verify(mPrimaryBouncerInteractor).show(true);

        verify(mPrimaryBouncerInteractor).show(true);

        verify(mCentralSurfaces).showKeyguard();

        verify(mCentralSurfaces).showKeyguard();

    }

    }
@@ -1092,11 +1092,26 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    @Test

    @Test

    @DisableSceneContainer

    @DisableSceneContainer

    public void testShowBouncerOrKeyguard_needsFullScreen_bouncerAlreadyShowing() {

    public void testShowBouncerOrKeyguard_needsFullScreen_bouncerAlreadyShowing() {

        boolean isFalsingReset = false;

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

                KeyguardSecurityModel.SecurityMode.SimPin);

                KeyguardSecurityModel.SecurityMode.SimPin);

        when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true);

        when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false, isFalsingReset);

        verify(mCentralSurfaces, never()).hideKeyguard();

        verify(mCentralSurfaces, never()).hideKeyguard();

        verify(mPrimaryBouncerInteractor).show(true);

    }



    @Test

    @DisableSceneContainer

    public void testShowBouncerOrKeyguard_needsFullScreen_bouncerAlreadyShowing_onFalsing() {

        boolean isFalsingReset = true;

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

                KeyguardSecurityModel.SecurityMode.SimPin);

        when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true);

        mStatusBarKeyguardViewManager.showBouncerOrKeyguard(false, isFalsingReset);

        verify(mCentralSurfaces, never()).hideKeyguard();



        // Do not refresh the full screen bouncer if the call is from falsing

        verify(mPrimaryBouncerInteractor, never()).show(true);

        verify(mPrimaryBouncerInteractor, never()).show(true);

    }

    }