From 613719feb53b0684dab312fb90491d8261263bf2 Mon Sep 17 00:00:00 2001 From: Curtis Belmonte Date: Fri, 12 Mar 2021 13:47:01 -0800 Subject: [PATCH] Add placeholder sensor ID to biometric event logs Test: Build and install Bug: 158352365 Change-Id: Ib94f3905332892ad318de96ee93c0b60c43221eb --- .../com/android/server/biometrics/AuthSession.java | 6 ++++-- .../biometrics/sensors/InternalCleanupClient.java | 3 ++- .../biometrics/sensors/InternalEnumerateClient.java | 3 ++- .../server/biometrics/sensors/LoggableMonitor.java | 12 ++++++++---- .../server/biometrics/sensors/face/aidl/Sensor.java | 3 ++- .../server/biometrics/sensors/face/hidl/Face10.java | 3 ++- .../biometrics/sensors/fingerprint/aidl/Sensor.java | 3 ++- .../sensors/fingerprint/hidl/Fingerprint21.java | 3 ++- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index f888200837684..07c26b48f32b2 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -596,7 +596,8 @@ public final class AuthSession implements IBinder.DeathRecipient { mPreAuthInfo.confirmationRequested, FrameworkStatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED, latency, - mDebugEnabled); + mDebugEnabled, + -1 /* sensorId */); } else { final long latency = System.currentTimeMillis() - mStartTimeMs; @@ -624,7 +625,8 @@ public final class AuthSession implements IBinder.DeathRecipient { error, 0 /* vendorCode */, mDebugEnabled, - latency); + latency, + -1 /* sensorId */); } } diff --git a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java index de571863dbd47..282261e6556f8 100644 --- a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java @@ -127,7 +127,8 @@ public abstract class InternalCleanupClient extends HalClientMonitor getTargetUserId(), identifier.getBiometricId()); FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, mStatsModality, - BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_FRAMEWORK); + BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_FRAMEWORK, + -1 /* sensorId */); } mEnrolledList.clear(); } diff --git a/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java b/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java index edde3d496e7c2..4da644d23dec7 100644 --- a/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java +++ b/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java @@ -126,7 +126,8 @@ public abstract class LoggableMonitor { mStatsClient, acquiredInfo, vendorCode, - Utils.isDebugEnabled(context, targetUserId)); + Utils.isDebugEnabled(context, targetUserId), + -1 /* sensorId */); } protected final void logOnError(Context context, int error, int vendorCode, int targetUserId) { @@ -164,7 +165,8 @@ public abstract class LoggableMonitor { error, vendorCode, Utils.isDebugEnabled(context, targetUserId), - sanitizeLatency(latency)); + sanitizeLatency(latency), + -1 /* sensorId */); } protected final void logOnAuthenticated(Context context, boolean authenticated, @@ -214,7 +216,8 @@ public abstract class LoggableMonitor { requireConfirmation, authState, sanitizeLatency(latency), - Utils.isDebugEnabled(context, targetUserId)); + Utils.isDebugEnabled(context, targetUserId), + -1 /* sensorId */); } protected final void logOnEnrolled(int targetUserId, long latency, boolean enrollSuccessful) { @@ -240,7 +243,8 @@ public abstract class LoggableMonitor { mStatsModality, targetUserId, sanitizeLatency(latency), - enrollSuccessful); + enrollSuccessful, + -1 /* sensorId */); } private long sanitizeLatency(long latency) { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java index 3434acbf73cc2..037deb1f7e931 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java @@ -532,7 +532,8 @@ public class Sensor { FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, BiometricsProtoEnums.MODALITY_FACE, - BiometricsProtoEnums.ISSUE_HAL_DEATH); + BiometricsProtoEnums.ISSUE_HAL_DEATH, + -1 /* sensorId */); } mScheduler.recordCrashState(); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java index 1b9bd7fd0cea6..bf82e84c4c20b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java @@ -383,7 +383,8 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider { FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, BiometricsProtoEnums.MODALITY_FACE, - BiometricsProtoEnums.ISSUE_HAL_DEATH); + BiometricsProtoEnums.ISSUE_HAL_DEATH, + -1 /* sensorId */); } mScheduler.recordCrashState(); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java index a98e7db43f790..db5ad37dd7fec 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java @@ -512,7 +512,8 @@ class Sensor { FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, BiometricsProtoEnums.MODALITY_FINGERPRINT, - BiometricsProtoEnums.ISSUE_HAL_DEATH); + BiometricsProtoEnums.ISSUE_HAL_DEATH, + -1 /* sensorId */); } mScheduler.recordCrashState(); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java index 6e22a797b435b..e3453e7dc1ef9 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java @@ -387,7 +387,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, BiometricsProtoEnums.MODALITY_FINGERPRINT, - BiometricsProtoEnums.ISSUE_HAL_DEATH); + BiometricsProtoEnums.ISSUE_HAL_DEATH, + -1 /* sensorId */); } mScheduler.recordCrashState();