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

Commit 561019c4 authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

Merge "Identity Check API" into main

parents 7326a1a9 1bad4e27

src/com/android/settings/Utils.java

+3 −3
Original line number Diff line number Diff line
@@ -1516,13 +1516,13 @@ public final class Utils extends com.android.settingslib.Utils { 
            final UserManager userManager = context.getSystemService(

                    UserManager.class);

            final int status = biometricManager.canAuthenticate(getEffectiveUserId(

                    userManager, userId), BiometricManager.Authenticators.MANDATORY_BIOMETRICS);

                    userManager, userId), BiometricManager.Authenticators.IDENTITY_CHECK);

            switch(status) {

                case BiometricManager.BIOMETRIC_SUCCESS:

                    return BiometricStatus.OK;

                case BiometricManager.BIOMETRIC_ERROR_LOCKOUT:

                    return BiometricStatus.LOCKOUT;

                case BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE:

                case BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE:

                case BiometricManager.BIOMETRIC_ERROR_NOT_ENABLED_FOR_APPS:

                    return BiometricStatus.NOT_ACTIVE;

                default:
@@ -1582,7 +1582,7 @@ public final class Utils extends com.android.settingslib.Utils { 
        final Intent intent = new Intent();

        if (android.hardware.biometrics.Flags.mandatoryBiometrics()) {

            intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,

                    BiometricManager.Authenticators.MANDATORY_BIOMETRICS);

                    BiometricManager.Authenticators.IDENTITY_CHECK);

        }

        intent.putExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT,

                resources.getString(R.string.cancel));

tests/robotests/src/com/android/settings/MainClearTest.java

+4 −4
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ public class MainClearTest { 
        doReturn(mMockActivity).when(mMainClear).getActivity();

        when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE);

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE);

    }



    @After
@@ -379,7 +379,7 @@ public class MainClearTest { 
        when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);

        when(mResources.getString(anyInt())).thenReturn(TEST_ACCOUNT_NAME);

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);

        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));

        doNothing().when(mMainClear).startActivityForResult(any(), anyInt());
@@ -406,7 +406,7 @@ public class MainClearTest { 
        when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);

        when(mResources.getString(anyInt())).thenReturn(TEST_ACCOUNT_NAME);

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_LOCKOUT);

        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));

        doNothing().when(mMainClear).startActivityForResult(any(), anyInt());

tests/robotests/src/com/android/settings/UtilsTest.java

+5 −5
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ public class UtilsTest { 
    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerReturnsSuccess_shouldReturnOk() {

        when(mBiometricManager.canAuthenticate(USER_ID,

                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))

                BiometricManager.Authenticators.IDENTITY_CHECK))

                .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);

        final Utils.BiometricStatus requestBiometricAuthenticationForMandatoryBiometrics =

                Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
@@ -554,7 +554,7 @@ public class UtilsTest { 
    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerReturnsError_shouldReturnError() {

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);

        assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,

                false /* biometricsAuthenticationRequested */, USER_ID)).isEqualTo(
@@ -567,10 +567,10 @@ public class UtilsTest { 
        when(mContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);

        when(mMockUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(USER_ID);

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);

        when(mBiometricManager.canAuthenticate(0 /* userId */,

                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))

                BiometricManager.Authenticators.IDENTITY_CHECK))

                .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);

        assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,

                false /* biometricsAuthenticationRequested */, USER_ID)).isEqualTo(
@@ -594,7 +594,7 @@ public class UtilsTest { 
        final Intent intent = intentArgumentCaptor.getValue();



        assertThat(intent.getExtra(BIOMETRIC_PROMPT_AUTHENTICATORS)).isEqualTo(

                BiometricManager.Authenticators.MANDATORY_BIOMETRICS);

                BiometricManager.Authenticators.IDENTITY_CHECK);

        assertThat(intent.getExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT)).isNotNull();

        assertThat(intent.getExtra(KeyguardManager.EXTRA_DESCRIPTION)).isNotNull();

        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, false))

tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java

+3 −3
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ public class CombinedBiometricProfileSettingsTest { 
        doReturn(mActivity).when(mFragment).getActivity();

        doReturn(mBiometricManager).when(mActivity).getSystemService(BiometricManager.class);

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_MANDATORY_NOT_ACTIVE);

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_IDENTITY_CHECK_NOT_ACTIVE);



        ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",

                FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
@@ -182,7 +182,7 @@ public class CombinedBiometricProfileSettingsTest { 
        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);

        doNothing().when(mFragment).startActivityForResult(any(), anyInt());

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))

                .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);



        mFragment.onAttach(mContext);

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class FingerprintSettingsFragmentTest { 
        doReturn(true).when(mFingerprintManager).isHardwareDetected();

        doReturn(mVibrator).when(mContext).getSystemService(Vibrator.class);

        when(mBiometricManager.canAuthenticate(PRIMARY_USER_ID,

                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))

                BiometricManager.Authenticators.IDENTITY_CHECK))

                .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);

    }
@@ -176,7 +176,7 @@ public class FingerprintSettingsFragmentTest { 
    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testLaunchBiometricPromptForFingerprint() {

        when(mBiometricManager.canAuthenticate(PRIMARY_USER_ID,

                BiometricManager.Authenticators.MANDATORY_BIOMETRICS))

                BiometricManager.Authenticators.IDENTITY_CHECK))

                .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);

        doNothing().when(mFingerprintManager).generateChallenge(anyInt(), any());

        when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true);