diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java index 5cd330a5753c7..0cd2e3d0ff593 100644 --- a/services/core/java/com/android/server/biometrics/AuthService.java +++ b/services/core/java/com/android/server/biometrics/AuthService.java @@ -261,7 +261,7 @@ public class AuthService extends SystemService { private void authenticateFastFail(String message, IBiometricServiceReceiver receiver) { // notify caller in cases where authentication is aborted before calling into // IBiometricService without raising an exception - Slog.e(TAG, message); + Slog.e(TAG, "authenticateFastFail: " + message); try { receiver.onError(TYPE_NONE, BIOMETRIC_ERROR_CANCELED, 0 /*vendorCode */); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index bfb42f81bb4da..bdde980f5cae3 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -382,9 +382,7 @@ public final class AuthSession implements IBinder.DeathRecipient { */ boolean onErrorReceived(int sensorId, int cookie, @BiometricConstants.Errors int error, int vendorCode) throws RemoteException { - if (DEBUG) { - Slog.v(TAG, "onErrorReceived sensor: " + sensorId + " error: " + error); - } + Slog.d(TAG, "onErrorReceived sensor: " + sensorId + " error: " + error); if (!containsCookie(cookie)) { Slog.e(TAG, "Unknown/expired cookie: " + cookie); diff --git a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java index c8fb80ac39288..ca357b4c2cec0 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java @@ -87,6 +87,8 @@ public abstract class AcquisitionClient extends HalClientMonitor implement * operation still needs to wait for the HAL to send ERROR_CANCELED. */ public void onUserCanceled() { + Slog.d(TAG, "onUserCanceled"); + // Send USER_CANCELED, but do not finish. Wait for the HAL to respond with ERROR_CANCELED, // which then finishes the AcquisitionClient's lifecycle. onErrorInternal(BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED, 0 /* vendorCode */, @@ -95,6 +97,8 @@ public abstract class AcquisitionClient extends HalClientMonitor implement } protected void onErrorInternal(int errorCode, int vendorCode, boolean finish) { + Slog.d(TAG, "onErrorInternal code: " + errorCode + ", finish: " + finish); + // In some cases, the framework will send an error to the caller before a true terminal // case (success, failure, or error) is received from the HAL (e.g. versions of fingerprint // that do not handle lockout under the HAL. In these cases, ensure that the framework only @@ -133,6 +137,8 @@ public abstract class AcquisitionClient extends HalClientMonitor implement @Override public void cancelWithoutStarting(@NonNull Callback callback) { + Slog.d(TAG, "cancelWithoutStarting: " + this); + final int errorCode = BiometricConstants.BIOMETRIC_ERROR_CANCELED; try { if (getListener() != null) { diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java index cf545f37bd431..80e60e67f05a6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -308,7 +308,7 @@ public abstract class AuthenticationClient extends AcquisitionClient mActivityTaskManager.registerTaskStackListener(mTaskStackListener); } - if (DEBUG) Slog.w(TAG, "Requesting auth for " + getOwnerString()); + Slog.d(TAG, "Requesting auth for " + getOwnerString()); mStartTimeMs = System.currentTimeMillis(); mAuthAttempted = true;