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

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

Merge "Add logs when addAuthToken is invoked" into sc-dev am: 05a37fac 

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

Change-Id: I9ab61c787a1cce9fc158f9bbe5039e52fbddd693
parents 202a83d4 05a37fac

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

+2 −1
Original line number Diff line number Diff line
@@ -645,7 +645,8 @@ public final class AuthSession implements IBinder.DeathRecipient { 
                case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED:

                case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED:

                    if (mTokenEscrow != null) {

                        mKeyStore.addAuthToken(mTokenEscrow);

                        final int result = mKeyStore.addAuthToken(mTokenEscrow);

                        Slog.d(TAG, "addAuthToken: " + result);

                    } else {

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

                    }

services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java

+2 −1
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 
                            getTargetUserId(), mIsStrongBiometric);

                } else if (!isBiometricPrompt() && listener != null) {

                    if (mIsStrongBiometric) {

                        KeyStore.getInstance().addAuthToken(byteToken);

                        final int result = KeyStore.getInstance().addAuthToken(byteToken);

                        Slog.d(TAG, "addAuthToken: " + result);

                    } else {

                        Slog.d(TAG, "Skipping addAuthToken");

                    }