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

Commit 6fdc18ad authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

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

Change-Id: I4568eff066f0d1508796d95e70404502c20f01e2
parents 993905f0 90b27662

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));