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

Commit fad64af4 authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "FRR - Add a device overlay to control QPR1 release targets" into... 

Merge "FRR - Add a device overlay to control QPR1 release targets" into udc-qpr-dev am: da7b419b am: 3c829b45

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



Change-Id: Ia6e2b632ef129e15f1c619080e685112d6a925c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93a377d1 3c829b45

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -5451,6 +5451,10 @@ 
         to enroll the other eligible biometric. -->

    <fraction name="config_biometricNotificationFrrThreshold">25%</fraction>



    <!-- Whether to enable the biometric notification for dual-modality device that enrolled a

         single biometric and experiences high FRR. -->

    <bool name="config_biometricFrrNotificationEnabled">false</bool>



    <!-- The component name for the default profile supervisor, which can be set as a profile owner

    even after user setup is complete. The defined component should be used for supervision purposes

    only. The component must be part of a system app. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2604,6 +2604,7 @@ 


  <!-- Biometric FRR config -->

  <java-symbol type="fraction" name="config_biometricNotificationFrrThreshold" />

  <java-symbol type="bool" name="config_biometricFrrNotificationEnabled" />



  <!-- Biometric FRR notification messages -->

  <java-symbol type="string" name="device_unlock_notification_name" />

services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class AuthenticationStatsCollector { 
    @NonNull private final FaceManager mFaceManager;

    @NonNull private final FingerprintManager mFingerprintManager;



    private final boolean mEnabled;

    private final float mThreshold;

    private final int mModality;
@@ -80,6 +81,7 @@ public class AuthenticationStatsCollector { 
    public AuthenticationStatsCollector(@NonNull Context context, int modality,

            @NonNull BiometricNotification biometricNotification) {

        mContext = context;

        mEnabled = context.getResources().getBoolean(R.bool.config_biometricFrrNotificationEnabled);

        mThreshold = context.getResources()

                .getFraction(R.fraction.config_biometricNotificationFrrThreshold, 1, 1);

        mUserAuthenticationStatsMap = new HashMap<>();
@@ -110,6 +112,11 @@ public class AuthenticationStatsCollector { 
    /** Update total authentication and rejected attempts. */

    public void authenticate(int userId, boolean authenticated) {



        // Don't collect data if the feature is disabled.

        if (!mEnabled) {

            return;

        }



        // Don't collect data for single-modality devices or user has both biometrics enrolled.

        if (isSingleModalityDevice()

                || (hasEnrolledFace(userId) && hasEnrolledFingerprint(userId))) {

services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java

+30 −1
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ public class AuthenticationStatsCollectorTest { 
    public void setUp() {



        when(mContext.getResources()).thenReturn(mResources);

        when(mResources.getBoolean(eq(R.bool.config_biometricFrrNotificationEnabled)))

                .thenReturn(true);

        when(mResources.getFraction(eq(R.fraction.config_biometricNotificationFrrThreshold),

                anyInt(), anyInt())).thenReturn(FRR_THRESHOLD);
@@ -110,7 +112,6 @@ public class AuthenticationStatsCollectorTest { 
                0 /* modality */, mBiometricNotification);

    }





    @Test

    public void authenticate_authenticationSucceeded_mapShouldBeUpdated() {

        // Assert that the user doesn't exist in the map initially.
@@ -342,4 +343,32 @@ public class AuthenticationStatsCollectorTest { 
        // Assert that notification count has been updated.

        assertThat(authenticationStats.getEnrollmentNotifications()).isEqualTo(1);

    }



    @Test

    public void authenticate_featureDisabled_mapMustNotBeUpdated() {

        // Disable the feature.

        when(mResources.getBoolean(eq(R.bool.config_biometricFrrNotificationEnabled)))

                .thenReturn(false);

        AuthenticationStatsCollector authenticationStatsCollector =

                new AuthenticationStatsCollector(mContext, 0 /* modality */,

                        mBiometricNotification);



        authenticationStatsCollector.setAuthenticationStatsForUser(USER_ID_1,

                new AuthenticationStats(USER_ID_1, 500 /* totalAttempts */,

                        400 /* rejectedAttempts */, 0 /* enrollmentNotifications */,

                        0 /* modality */));



        authenticationStatsCollector.authenticate(USER_ID_1, false /* authenticated */);



        // Assert that no notification should be sent.

        verify(mBiometricNotification, never()).sendFaceEnrollNotification(any());

        verify(mBiometricNotification, never()).sendFpEnrollNotification(any());

        // Assert that data hasn't been updated.

        AuthenticationStats authenticationStats = authenticationStatsCollector

                .getAuthenticationStatsForUser(USER_ID_1);

        assertThat(authenticationStats.getTotalAttempts()).isEqualTo(500);

        assertThat(authenticationStats.getRejectedAttempts()).isEqualTo(400);

        assertThat(authenticationStats.getEnrollmentNotifications()).isEqualTo(0);

        assertThat(authenticationStats.getFrr()).isWithin(0f).of(0.8f);

    }

}