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

Commit 613719fe authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

Add placeholder sensor ID to biometric event logs 

Test: Build and install

Bug: 158352365
Change-Id: Ib94f3905332892ad318de96ee93c0b60c43221eb
parent 14a3e361

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

+4 −2
Original line number Diff line number Diff line
@@ -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 */);

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -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();

    }

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

+8 −4
Original line number Diff line number Diff line
@@ -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) {

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

+2 −1
Original line number Diff line number Diff line
@@ -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();