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

Commit c277183c authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Add package, activity count in allow list for ContentCapture logging"... 

Merge "Add package, activity count in allow list for ContentCapture logging" into tm-dev am: 790afd00 am: 7e771703

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367865



Change-Id: I82161884280fe26edd0f4cecf1c64f803b5e6b6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6949f435 7e771703

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 */