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

Commit 213c08ec authored by Kevin Chyn's avatar Kevin Chyn
Browse files

33/n: Do not upload logs if any fields are unknown 

Currently all ClientMonitors extend from LoggableMonitor. In the
interest of time, let's leave the structure the way it is. Since
logging does not apply to all monitors, check if fields are unknown
before logging.

Bug: 157790417
Test: Builds
Change-Id: Iac0daffdec26a07b8debdf506caaf70718c71ee8
parent 858de7a4

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

+24 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ public abstract class LoggableMonitor { 
    private final int mStatsClient;

    private long mFirstAcquireTimeMs;



    protected long getFirstAcquireTimeMs() {

        return mFirstAcquireTimeMs;

    }



    /**

     * Only valid for AuthenticationClient.

     * @return true if the client is authenticating for a crypto operation.
@@ -62,6 +58,12 @@ public abstract class LoggableMonitor { 
        mStatsClient = statsClient;

    }



    private boolean isAnyFieldUnknown() {

        return mStatsModality == BiometricsProtoEnums.MODALITY_UNKNOWN

                || mStatsAction == BiometricsProtoEnums.ACTION_UNKNOWN

                || mStatsClient == BiometricsProtoEnums.CLIENT_UNKNOWN;

    }



    protected final void logOnAcquired(Context context, int acquiredInfo, int vendorCode,

            int targetUserId) {
@@ -86,6 +88,11 @@ public abstract class LoggableMonitor { 
                    + ", AcquiredInfo: " + acquiredInfo

                    + ", VendorCode: " + vendorCode);

        }



        if (isAnyFieldUnknown()) {

            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_ACQUIRED,

                mStatsModality,

                targetUserId,
@@ -114,6 +121,11 @@ public abstract class LoggableMonitor { 
        } else {

            Slog.v(TAG, "Error latency: " + latency);

        }



        if (isAnyFieldUnknown()) {

            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_ERROR_OCCURRED,

                mStatsModality,

                targetUserId,
@@ -157,6 +169,10 @@ public abstract class LoggableMonitor { 
            Slog.v(TAG, "Authentication latency: " + latency);

        }



        if (isAnyFieldUnknown()) {

            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_AUTHENTICATED,

                mStatsModality,

                targetUserId,
@@ -179,6 +195,10 @@ public abstract class LoggableMonitor { 
            Slog.v(TAG, "Enroll latency: " + latency);

        }



        if (isAnyFieldUnknown()) {

            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_ENROLLED,

                mStatsModality,

                targetUserId,