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

Commit 0fd8d8e1 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Update error prioritization in PreAutInfo" into sc-dev am: 4a50c4e8 

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

Change-Id: Iffb0c255aac9a9ca51fe4ddf70ef13fe6fdeefd9
parents 3ccc45f9 4a50c4e8

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

+21 −4
Original line number Original line Diff line number Diff line
@@ -259,6 +259,21 @@ class PreAuthInfo { 
        this.confirmationRequested = confirmationRequested;

        this.confirmationRequested = confirmationRequested;

    }

    }





    private Pair<BiometricSensor, Integer> calculateErrorByPriority() {

        // If the caller requested STRONG, and the device contains both STRONG and non-STRONG

        // sensors, prioritize BIOMETRIC_NOT_ENROLLED over the weak sensor's

        // BIOMETRIC_INSUFFICIENT_STRENGTH error. Pretty sure we can always prioritize

        // BIOMETRIC_NOT_ENROLLED over any other error (unless of course its calculation is

        // wrong, in which case we should fix that instead).

        for (Pair<BiometricSensor, Integer> pair : ineligibleSensors) {

            if (pair.second == BIOMETRIC_NOT_ENROLLED) {

                return pair;

            }

        }



        return ineligibleSensors.get(0);

    }



    /**

    /**

     * With {@link PreAuthInfo} generated with the requested authenticators from the public API

     * With {@link PreAuthInfo} generated with the requested authenticators from the public API

     * surface, combined with the actual sensor/credential and user/system settings, calculate the

     * surface, combined with the actual sensor/credential and user/system settings, calculate the
@@ -281,8 +296,9 @@ class PreAuthInfo { 
            } else {

            } else {

                // Pick the first sensor error if it exists

                // Pick the first sensor error if it exists

                if (!ineligibleSensors.isEmpty()) {

                if (!ineligibleSensors.isEmpty()) {

                    modality |= ineligibleSensors.get(0).first.modality;

                    final Pair<BiometricSensor, Integer> pair = calculateErrorByPriority();

                    status = ineligibleSensors.get(0).second;

                    modality |= pair.first.modality;

                    status = pair.second;

                } else {

                } else {

                    modality |= TYPE_CREDENTIAL;

                    modality |= TYPE_CREDENTIAL;

                    status = CREDENTIAL_NOT_ENROLLED;

                    status = CREDENTIAL_NOT_ENROLLED;
@@ -297,8 +313,9 @@ class PreAuthInfo { 
            } else {

            } else {

                // Pick the first sensor error if it exists

                // Pick the first sensor error if it exists

                if (!ineligibleSensors.isEmpty()) {

                if (!ineligibleSensors.isEmpty()) {

                    modality |= ineligibleSensors.get(0).first.modality;

                    final Pair<BiometricSensor, Integer> pair = calculateErrorByPriority();

                    status = ineligibleSensors.get(0).second;

                    modality |= pair.first.modality;

                    status = pair.second;

                } else {

                } else {

                    modality |= TYPE_NONE;

                    modality |= TYPE_NONE;

                    status = BIOMETRIC_NO_HARDWARE;

                    status = BIOMETRIC_NO_HARDWARE;