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

Commit 9f21c36e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662... 

Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662 am: 6fdc18ad" into rvc-d1-dev-plus-aosp am: 158066f7

Change-Id: I21eb97e940e8eec6f98592ca0f59d4019506b74a
parents 51a200d9 158066f7

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

+7 −1
Original line number Diff line number Diff line
@@ -1504,11 +1504,17 @@ public class BiometricService extends SystemService { 
        try {

            switch (reason) {

                case BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED:

                    if (credentialAttestation != null) {

                        mKeyStore.addAuthToken(credentialAttestation);

                    } else {

                        Slog.e(TAG, "Credential confirmed but attestation is null");

                    }

                case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED:

                case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED:

                    if (mCurrentAuthSession.mTokenEscrow != null) {

                        mKeyStore.addAuthToken(mCurrentAuthSession.mTokenEscrow);

                    } else {

                        Slog.e(TAG, "mTokenEscrow is null");

                    }

                    mCurrentAuthSession.mClientReceiver.onAuthenticationSucceeded(

                            Utils.getAuthenticationTypeForResult(reason));