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

Commit 924e8c67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove mandatory_biometrics flag" into main

parents 2e0c1ffd 8f48f804

src/com/android/settings/Utils.java

+3 −6
Original line number Diff line number Diff line
@@ -1600,8 +1600,7 @@ public final class Utils extends com.android.settingslib.Utils { 
            Log.e(TAG, "Biometric Manager is null.");

            return BiometricStatus.NOT_ACTIVE;

        }

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

                && !biometricsAuthenticationRequested) {

        if (!biometricsAuthenticationRequested) {

            final UserManager userManager = context.getSystemService(

                    UserManager.class);

            final int status = biometricManager.canAuthenticate(getEffectiveUserId(
@@ -1691,10 +1690,8 @@ public final class Utils extends com.android.settingslib.Utils { 
    private static Intent getIntentForBiometricAuthentication(Resources resources,

            int effectiveUserId, boolean hideBackground, @Nullable Intent data) {

        final Intent intent = new Intent();

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

        intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,

                BiometricManager.Authenticators.IDENTITY_CHECK);

        }

        intent.putExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT,

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

        intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION,

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
                        showConfirmCredentials();

                    } else {

                        Log.i(TAG, "Finishing, device credential not requested");

                        if (Flags.mandatoryBiometrics()

                                && errorCode == BiometricPrompt.BIOMETRIC_ERROR_LOCKOUT_PERMANENT) {

                        if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_LOCKOUT_PERMANENT) {

                            setResult(BIOMETRIC_LOCKOUT_ERROR_RESULT);

                        }

                        finish();

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

+0 −4
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.Flags;

import android.os.UserManager;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;

import android.view.LayoutInflater;
@@ -371,7 +369,6 @@ public class MainClearTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testOnActivityResultInternal_keyguardRequestTriggeringBiometricPrompt() {

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

        when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
@@ -395,7 +392,6 @@ public class MainClearTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testOnActivityResultInternal_keyguardRequestNotTriggeringBiometricPrompt_lockoutError() {

        final ArgumentCaptor<IdentityCheckBiometricErrorDialog> argumentCaptor =

                ArgumentCaptor.forClass(IdentityCheckBiometricErrorDialog.class);

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

+0 −6
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import android.graphics.drawable.BitmapDrawable; 
import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.VectorDrawable;

import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.Flags;

import android.hardware.devicestate.DeviceState;

import android.hardware.devicestate.DeviceStateManager;

import android.hardware.face.FaceManager;
@@ -655,7 +654,6 @@ public class UtilsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerNull_shouldReturnNotActive() {

        when(mContext.getSystemService(BiometricManager.class)).thenReturn(null);

        assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
@@ -664,7 +662,6 @@ public class UtilsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerReturnsSuccess_shouldReturnOk() {

        when(mBiometricManager.canAuthenticate(USER_ID,

                BiometricManager.Authenticators.IDENTITY_CHECK))
@@ -677,7 +674,6 @@ public class UtilsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerReturnsError_shouldReturnError() {

        when(mBiometricManager.canAuthenticate(anyInt(),

                eq(BiometricManager.Authenticators.IDENTITY_CHECK)))
@@ -688,7 +684,6 @@ public class UtilsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testRequestBiometricAuthentication_biometricManagerReturnsSuccessForDifferentUser_shouldReturnError() {

        when(mContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);

        when(mMockUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(USER_ID);
@@ -704,7 +699,6 @@ public class UtilsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testLaunchBiometricPrompt_checkIntentValues() {

        when(mFragment.getContext()).thenReturn(mContext);

        when(mContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);

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

+0 −3
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.content.Intent;

import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.Flags;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.AndroidRuntimeException;

import android.view.LayoutInflater;
@@ -177,7 +175,6 @@ public class CombinedBiometricProfileSettingsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)

    public void testLaunchBiometricPrompt_onCreateFragment() {

        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);

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