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

Commit 8009df38 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Remove activity name from autofill metrics logger." into sc-dev am: c254f87c 

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

Change-Id: I08614792eef1a0037d9a2819163c4736d8ab7c31
parents 6f13b88f c254f87c

core/java/android/service/autofill/augmented/Helper.java

+4 −1
Original line number Diff line number Diff line
@@ -32,9 +32,12 @@ public final class Helper { 
     */

    public static void logResponse(int type, @NonNull String servicePackageName,

            @NonNull ComponentName componentName, int mSessionId, long durationMs) {

        // Remove activity name from logging

        final ComponentName sanitizedComponentName =

                new ComponentName(componentName.getPackageName(), "");

        final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_AUGMENTED_RESPONSE)

                .setType(type)

                .setComponentName(componentName)

                .setComponentName(sanitizedComponentName)

                .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, mSessionId)

                .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName)

                .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, durationMs);

core/java/android/view/autofill/AutofillManager.java

+4 −1
Original line number Diff line number Diff line
@@ -2459,7 +2459,10 @@ public final class AutofillManager { 
            // Client should never be null here, but it doesn't hurt to check...

            log.setPackageName(mContext.getPackageName());

        } else {

            log.setComponentName(client.autofillClientGetComponentName());

            // Remove activity name from logging

            final ComponentName sanitizedComponentName =

                    new ComponentName(client.autofillClientGetComponentName().getPackageName(), "");

            log.setComponentName(sanitizedComponentName);

        }

        return log;

    }

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

+4 −10
Original line number Diff line number Diff line
@@ -1515,16 +1515,10 @@ final class AutofillManagerServiceImpl 
            final int intDuration = duration > Integer.MAX_VALUE

                    ? Integer.MAX_VALUE

                    : (int) duration;

            // NOTE: not using Helper.newLogMaker() because we're setting the componentName instead

            // of package name

            final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_SERVICE_DISABLED_ACTIVITY)

                    .setComponentName(componentName)

                    .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, getServicePackageName())

                    .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, intDuration)

                    .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, sessionId);

            if (compatMode) {

                log.addTaggedData(MetricsEvent.FIELD_AUTOFILL_COMPAT_MODE, 1);

            }



            final LogMaker log = Helper.newLogMaker(MetricsEvent.AUTOFILL_SERVICE_DISABLED_ACTIVITY,

                    componentName, getServicePackageName(), sessionId, compatMode)

                    .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, intDuration);

            mMetricsLogger.write(log);

        }

    }

services/autofill/java/com/android/server/autofill/Helper.java

+4 −1
Original line number Diff line number Diff line
@@ -127,8 +127,11 @@ public final class Helper { 
    @NonNull

    public static LogMaker newLogMaker(int category, @NonNull ComponentName componentName,

            @NonNull String servicePackageName, int sessionId, boolean compatMode) {

        // Remove activity name from logging

        final ComponentName sanitizedComponentName =

                new ComponentName(componentName.getPackageName(), "");

        return newLogMaker(category, servicePackageName, sessionId, compatMode)

                .setComponentName(componentName);

                .setComponentName(sanitizedComponentName);

    }



    public static void printlnRedactedText(@NonNull PrintWriter pw, @Nullable CharSequence text) {