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

Commit 1606f38f authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't delay bouncer if face + fp enrolled" into tm-d1-dev am:... 

Merge "Don't delay bouncer if face + fp enrolled" into tm-d1-dev am: 48bcccef am: 4ac0f1f7 am: b669840c

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



Change-Id: I3cb70c1076a476dd16e1c5fff85762a76e5f649b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7070d7f4 b669840c

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -216,7 +216,10 @@ public class KeyguardBouncer { 




            // Split up the work over multiple frames.

            // Split up the work over multiple frames.

            DejankUtils.removeCallbacks(mResetRunnable);

            DejankUtils.removeCallbacks(mResetRunnable);

            if (mKeyguardStateController.isFaceAuthEnabled() && !needsFullscreenBouncer()

            if (mKeyguardStateController.isFaceAuthEnabled()

                    && !mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(

                            KeyguardUpdateMonitor.getCurrentUser())

                    && !needsFullscreenBouncer()

                    && !mKeyguardUpdateMonitor.userNeedsStrongAuth()

                    && !mKeyguardUpdateMonitor.userNeedsStrongAuth()

                    && !mKeyguardBypassController.getBypassEnabled()) {

                    && !mKeyguardBypassController.getBypassEnabled()) {

                mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY);

                mHandler.postDelayed(mShowRunnable, BOUNCER_FACE_DELAY);

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -399,9 +399,8 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        mBouncer.hide(false /* destroyView */);

        mBouncer.hide(false /* destroyView */);

        verify(mHandler).removeCallbacks(eq(showRunnable.getValue()));

        verify(mHandler).removeCallbacks(eq(showRunnable.getValue()));

    }

    }



    @Test

    @Test

    public void testShow_delaysIfFaceAuthIsRunning_unlessBypass() {

    public void testShow_delaysIfFaceAuthIsRunning_unlessBypassEnabled() {

        when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);

        when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);

        when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);

        when(mKeyguardBypassController.getBypassEnabled()).thenReturn(true);

        mBouncer.show(true /* reset */);

        mBouncer.show(true /* reset */);
@@ -409,6 +408,16 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
        verify(mHandler, never()).postDelayed(any(), anyLong());

        verify(mHandler, never()).postDelayed(any(), anyLong());

    }

    }





    @Test

    public void testShow_delaysIfFaceAuthIsRunning_unlessFingerprintEnrolled() {

        when(mKeyguardStateController.isFaceAuthEnabled()).thenReturn(true);

        when(mKeyguardUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(0))

                .thenReturn(true);

        mBouncer.show(true /* reset */);



        verify(mHandler, never()).postDelayed(any(), anyLong());

    }



    @Test

    @Test

    public void testRegisterUpdateMonitorCallback() {

    public void testRegisterUpdateMonitorCallback() {

        verify(mKeyguardUpdateMonitor).registerCallback(any());

        verify(mKeyguardUpdateMonitor).registerCallback(any());