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

Commit 1b426b5a authored by lpeter's avatar lpeter
Browse files

Remove PackageChangedBroadcastReported metrics. 

Flag: EXEMPT bugfix

Bug: 435116574
Test: Manual test
Change-Id: I5ec60048a220d547742d331811c2f71e38cf5d2a
parent f6613ab4

services/core/java/com/android/server/pm/BroadcastHelper.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -363,10 +363,6 @@ public final class BroadcastHelper { 
        final boolean isForWholeApp = componentNames.contains(packageName);

        final boolean isForWholeApp = componentNames.contains(packageName);

        final String callingPackageNameForTrace = mContext.getPackageManager().getNameForUid(

        final String callingPackageNameForTrace = mContext.getPackageManager().getNameForUid(

                callingUidForTrace);

                callingUidForTrace);



        PackageMetrics.reportPackageChangedBroadcast(callingUidForTrace, packageUid, isForWholeApp,

                reasonForTrace);



        if (isForWholeApp) {

        if (isForWholeApp) {

            tracePackageChangedBroadcastEvent(true /* applyFlag */, reasonForTrace, packageName,

            tracePackageChangedBroadcastEvent(true /* applyFlag */, reasonForTrace, packageName,

                    "<implicit>" /* targetPackageName */, "whole" /* targetComponent */,

                    "<implicit>" /* targetPackageName */, "whole" /* targetComponent */,

services/core/java/com/android/server/pm/PackageMetrics.java

+0 −31
Original line number Original line Diff line number Diff line
@@ -621,13 +621,6 @@ public final class PackageMetrics { 
                uid, componentOldState, componentNewState, isLauncher, isForWholeApp, callingUid);

                uid, componentOldState, componentNewState, isLauncher, isForWholeApp, callingUid);

    }

    }





    public static void reportPackageChangedBroadcast(int callingUid, int targetUid,

            boolean isForWholeApp, String reason) {

        FrameworkStatsLog.write(FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED,

                callingUid, targetUid,

                convertPackageChangedReasonStringToInteger(reason, isForWholeApp));

    }



    /**

    /**

     * Metrics for reporting what kind of reason to call the invalidation.

     * Metrics for reporting what kind of reason to call the invalidation.

     */

     */
@@ -635,30 +628,6 @@ public final class PackageMetrics { 
        storeInvalidationMetrics(cacheType, invalidationReason);

        storeInvalidationMetrics(cacheType, invalidationReason);

    }

    }





    private static int convertPackageChangedReasonStringToInteger(String reason,

            boolean isForWholeApp) {

        return switch (reason) {

            case STRING_COMPONENT_STATE_CHANGED -> isForWholeApp

                    ?

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_PACKAGE_STATE_CHANGED

                    : FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_COMPONENT_STATE_CHANGED;

            case STRING_COMPONENT_LABEL_ICON_CHANGED ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_COMPONENT_LABEL_ICON_CHANGED;

            case STRING_RESET_COMPONENT_STATE_CHANGED ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_COMPONENT_STATE_RESET;

            case STRING_MIME_GROUP_CHANGED ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_MIME_GROUP_CHANGED;

            case STRING_OVERLAY_CHANGED ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_OVERLAY_CHANGED;

            case STRING_STATIC_SHARED_LIBRARY_CHANGED ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_STATIC_SHARED_LIBRARY_CHANGED;

            case STRING_TEST ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_TEST;

            default ->

                    FrameworkStatsLog.PACKAGE_CHANGED_BROADCAST_REPORTED__REASON__PACKAGE_CHANGED_REASON_UNSPECIFIED;

        };

    }



    private static void storeInvalidationMetrics(int cacheType, int invalidationReason) {

    private static void storeInvalidationMetrics(int cacheType, int invalidationReason) {

        synchronized (sInvalidationMetrics) {

        synchronized (sInvalidationMetrics) {

            SparseIntArray invalidationMetrics = sInvalidationMetrics.get(cacheType);

            SparseIntArray invalidationMetrics = sInvalidationMetrics.get(cacheType);