Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add placeholder sensor ID to biometric event logs" into sc-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2021-03-19 22:21:30 +00:00
committed by Android (Google) Code Review
parent 54580409da 613719feb5
commit a5a930725f
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/biometrics/AuthSession.java
View File

@@ -597,7 +597,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;
@@ -625,7 +626,8 @@ public final class AuthSession implements IBinder.DeathRecipient {
error,
0 /* vendorCode */,
mDebugEnabled,
latency);
latency,
-1 /* sensorId */);
}
}

3
services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
View File

@@ -127,7 +127,8 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide
getContext().getPackageName(), mBiometricUtils, getSensorId(), mAuthenticatorIds);
FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED,
mStatsModality,
BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_HAL);
BiometricsProtoEnums.ISSUE_UNKNOWN_TEMPLATE_ENROLLED_HAL,
-1 /* sensorId */);
mCurrentTask.start(mRemoveCallback);
}

3
services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java
View File

@@ -118,7 +118,8 @@ public abstract class InternalEnumerateClient<T> extends HalClientMonitor<T>
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();
}

12
services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java
View File

@@ -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) {

3
services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java
View File

@@ -546,7 +546,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();

3
services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
View File

@@ -387,7 +387,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();

3
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java
View File

@@ -526,7 +526,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();

3
services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
View File

@@ -390,7 +390,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();