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

Commit 790afd00 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Add package, activity count in allow list for ContentCapture logging" into tm-dev

parents 7d1b14eb 5b9fe2f2

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public final class ContentCaptureMetricsLogger { 
    public static void writeServiceEvent(int eventType, @NonNull String serviceName) {

        // we should not logging the application package name

        FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, eventType,

                serviceName, /* componentName= */ null);

                serviceName, /* componentName= */ null, 0, 0);

    }



    /** @hide */
@@ -49,14 +49,13 @@ public final class ContentCaptureMetricsLogger { 
    public static void writeSetWhitelistEvent(@Nullable ComponentName service,

            @Nullable List<String> packages, @Nullable List<ComponentName> activities) {

        final String serviceName = ComponentName.flattenToShortString(service);

        // TODO: log allow list count.

        int packageCount = packages != null ? packages.size() : 0;

        int activityCount = activities != null ? activities.size() : 0;

        // we should not logging the application package name

        // log the allow list package and activity count instead

        FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS,

                FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_WHITELIST,

                serviceName, /* allowListStr= */ null);

                serviceName, /* allowListStr= */ null, packageCount, activityCount);

    }



    /** @hide */