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

Commit 59cb43a8 authored by Diya Bera's avatar Diya Bera
Browse files

Remove Identity Check specific error dialogs 

Removing error dialogs since the biometric prompt will be handling the
errors

Flag: android.hardware.biometrics.bp_fallback_options
Fixes: 414862860
Test: atest MainClearTest ChooseLockGenericTest
CombinedBiometricProfileSettingsTest BuildNumberPreferenceControllerTest

Change-Id: I402bd70469f0e56bfc440984e49892cd452564ff
parent 70e8c089

src/com/android/settings/MainClear.java

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.pm.UserInfo; 
import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.hardware.biometrics.Flags;

import android.os.Bundle;

import android.os.Environment;

import android.os.SystemProperties;
@@ -194,7 +195,13 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis 
                    Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),

                            false /* biometricsAuthenticationRequested */,

                            userId);

            if (biometricAuthStatus == Utils.BiometricStatus.OK) {

            if (Flags.bpFallbackOptions()) {

                if (biometricAuthStatus != Utils.BiometricStatus.NOT_ACTIVE) {

                    Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRICS_REQUEST,

                            userId, false /* hideBackground */);

                    return;

                }

            } else if (biometricAuthStatus == Utils.BiometricStatus.OK) {

                Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRICS_REQUEST,

                        userId, false /* hideBackground */);

                return;

src/com/android/settings/Utils.java

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static android.text.format.DateUtils.FORMAT_SHOW_DATE; 


import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_AUTHENTICATORS;

import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_HIDE_BACKGROUND;

import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT;

import static com.android.settings.password.ConfirmDeviceCredentialActivity.EXTRA_DATA;



import android.app.ActionBar;
@@ -1692,8 +1691,6 @@ public final class Utils extends com.android.settingslib.Utils { 
        final Intent intent = new Intent();

        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,

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

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, true);

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+7 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.hardware.biometrics.BiometricAuthenticator; 
import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.BiometricManager.Authenticators;

import android.hardware.biometrics.BiometricManager.BiometricError;

import android.hardware.biometrics.Flags;

import android.hardware.biometrics.SensorProperties;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;
@@ -474,7 +475,12 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
                        final Utils.BiometricStatus biometricStatus =

                                Utils.requestBiometricAuthenticationForMandatoryBiometrics(this,

                                        false /* biometricsAuthenticationRequested */, mUserId);

                        if (biometricStatus == Utils.BiometricStatus.OK) {

                        if (Flags.bpFallbackOptions()) {

                            if (biometricStatus != Utils.BiometricStatus.NOT_ACTIVE) {

                                Utils.launchBiometricPromptForMandatoryBiometrics(this,

                                        BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);

                            }

                        } else if (biometricStatus == Utils.BiometricStatus.OK) {

                            Utils.launchBiometricPromptForMandatoryBiometrics(this,

                                    BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);

                        } else if (biometricStatus != Utils.BiometricStatus.NOT_ACTIVE) {

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent; 
import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.Flags;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;
@@ -466,7 +467,12 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
                final Utils.BiometricStatus biometricStatus =

                        Utils.requestBiometricAuthenticationForMandatoryBiometrics(this,

                                false /* biometricsAuthenticationRequested */, mUserId);

                if (biometricStatus == Utils.BiometricStatus.OK) {

                if (Flags.bpFallbackOptions()) {

                    if (biometricStatus != Utils.BiometricStatus.NOT_ACTIVE) {

                        Utils.launchBiometricPromptForMandatoryBiometrics(this,

                                BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);

                    }

                } else if (biometricStatus == Utils.BiometricStatus.OK) {

                    Utils.launchBiometricPromptForMandatoryBiometrics(this,

                            BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);

                } else if (biometricStatus != Utils.BiometricStatus.NOT_ACTIVE) {

src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java

+8 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED; 
import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.hardware.biometrics.Flags;

import android.hardware.biometrics.SensorProperties;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;
@@ -319,7 +320,13 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { 
                                    getActivity(),

                                    mBiometricsAuthenticationRequested,

                                    mUserId);

                    if (biometricAuthStatus == Utils.BiometricStatus.OK) {

                    if (Flags.bpFallbackOptions()) {

                        if (biometricAuthStatus != Utils.BiometricStatus.NOT_ACTIVE) {

                            mBiometricsAuthenticationRequested = true;

                            Utils.launchBiometricPromptForMandatoryBiometrics(this,

                                    BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);

                        }

                    } else if (biometricAuthStatus == Utils.BiometricStatus.OK) {

                        mBiometricsAuthenticationRequested = true;

                        Utils.launchBiometricPromptForMandatoryBiometrics(this,

                                BIOMETRIC_AUTH_REQUEST,