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

Commit ceeacda5 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Don't listen for udfps on lock down or encryption 

If the device is encryped or is in lock down, don't show the udfps
overlay because the user cannot authenticate from this state anyway.

Test: atest KeyguardUpdateMonitorTest
Fixes: 183629563
Change-Id: Ie48dfa6bc4a5db0a35be02fd973d982ef3475315
parent 726db03e

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        return shouldListenForFingerprint()

                && !mBouncer

                && !getUserCanSkipBouncer(getCurrentUser())

                && !isEncryptedOrLockdown(getCurrentUser())

                && mStrongAuthTracker.hasUserAuthenticatedSinceBoot();

    }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+15 −0
Original line number Diff line number Diff line
@@ -910,6 +910,21 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.shouldListenForUdfps()).isEqualTo(false);

    }



    @Test

    public void testShouldNotListenForUdfps_whenInLockDown() {

        // GIVEN a "we should listen for udfps" state

        setKeyguardBouncerVisibility(false /* isVisible */);

        mStatusBarStateListener.onStateChanged(StatusBarState.KEYGUARD);

        when(mStrongAuthTracker.hasUserAuthenticatedSinceBoot()).thenReturn(true);



        // WHEN device in lock down

        when(mStrongAuthTracker.getStrongAuthForUser(anyInt())).thenReturn(

                KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);



        // THEN we shouldn't listen for udfps

        assertThat(mKeyguardUpdateMonitor.shouldListenForUdfps()).isEqualTo(false);

    }



    @Test

    public void testRequireUnlockForNfc_Broadcast() {

        KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);