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

Commit f8250261 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prioritize strength error over hardware error" into android15-tests-dev am: 4998bb62 

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



Change-Id: I613d4956c84ebceb0876d91cd7081380ba04af1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d561369 4998bb62

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

+4 −4
Original line number Diff line number Diff line
@@ -174,10 +174,6 @@ class PreAuthInfo { 
            return BIOMETRIC_NO_HARDWARE;

        }



        if (sensor.modality == TYPE_FACE && biometricCameraManager.isAnyCameraUnavailable()) {

            return BIOMETRIC_HARDWARE_NOT_DETECTED;

        }



        final boolean wasStrongEnough =

                Utils.isAtLeastStrength(sensor.oemStrength, requestedStrength);

        final boolean isStrongEnough =
@@ -189,6 +185,10 @@ class PreAuthInfo { 
            return BIOMETRIC_INSUFFICIENT_STRENGTH;

        }



        if (sensor.modality == TYPE_FACE && biometricCameraManager.isAnyCameraUnavailable()) {

            return BIOMETRIC_HARDWARE_NOT_DETECTED;

        }



        try {

            if (!sensor.impl.isHardwareDetected(opPackageName)) {

                return BIOMETRIC_HARDWARE_NOT_DETECTED;

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

+23 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_NO 
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;

import static android.hardware.biometrics.BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE;

import static android.hardware.biometrics.BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE;



import static com.android.server.biometrics.sensors.LockoutTracker.LOCKOUT_NONE;
@@ -55,6 +56,7 @@ public class PreAuthInfoTest { 
    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private static final int USER_ID = 0;

    private static final int SENSOR_ID_FINGERPRINT = 0;

    private static final int SENSOR_ID_FACE = 1;

    private static final String TEST_PACKAGE_NAME = "PreAuthInfoTestPackage";
@@ -184,6 +186,20 @@ public class PreAuthInfoTest { 
        assertThat(preAuthInfo.eligibleSensors.get(0).modality).isEqualTo(TYPE_FINGERPRINT);

    }



    @Test

    public void prioritizeStrengthErrorBeforeCameraUnavailableError() throws Exception {

        final BiometricSensor sensor = getFaceSensorWithStrength(

                BiometricManager.Authenticators.BIOMETRIC_WEAK);

        final PromptInfo promptInfo = new PromptInfo();

        promptInfo.setAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG);

        promptInfo.setNegativeButtonText(TEST_PACKAGE_NAME);

        final PreAuthInfo preAuthInfo = PreAuthInfo.create(mTrustManager, mDevicePolicyManager,

                mSettingObserver, List.of(sensor), USER_ID , promptInfo, TEST_PACKAGE_NAME,

                false /* checkDevicePolicyManager */, mContext, mBiometricCameraManager);



        assertThat(preAuthInfo.getCanAuthenticateResult()).isEqualTo(BIOMETRIC_ERROR_NO_HARDWARE);

    }



    private BiometricSensor getFingerprintSensor() {

        BiometricSensor sensor = new BiometricSensor(mContext, SENSOR_ID_FINGERPRINT,

                TYPE_FINGERPRINT, BiometricManager.Authenticators.BIOMETRIC_STRONG,
@@ -202,9 +218,10 @@ public class PreAuthInfoTest { 
        return sensor;

    }



    private BiometricSensor getFaceSensor() {

    private BiometricSensor getFaceSensorWithStrength(

            @BiometricManager.Authenticators.Types int sensorStrength) {

        BiometricSensor sensor = new BiometricSensor(mContext, SENSOR_ID_FACE, TYPE_FACE,

                BiometricManager.Authenticators.BIOMETRIC_STRONG, mFaceAuthenticator) {

                sensorStrength, mFaceAuthenticator) {

            @Override

            boolean confirmationAlwaysRequired(int userId) {

                return false;
@@ -218,4 +235,8 @@ public class PreAuthInfoTest { 


        return sensor;

    }



    private BiometricSensor getFaceSensor() {

        return getFaceSensorWithStrength(BiometricManager.Authenticators.BIOMETRIC_STRONG);

    }

}