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

Commit 5c0c8a6b authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "Patrially revert 4ec02693." into nyc-dev 

am: 9bfc33f8

* commit '9bfc33f8':
  Patrially revert 4ec02693.

Change-Id: Id15e4b0f664dc286974529feb5cf08010614ff4c
parents a2464c36 9bfc33f8

proto/src/metrics_constants.proto

+0 −15
Original line number Diff line number Diff line
@@ -2191,21 +2191,6 @@ message MetricsEvent { 
    // CATEGORY: SETTINGS

    ACCOUNTS_WORK_PROFILE_SETTINGS = 401;



    // The number of packages optimized during the optimizing apps dialog.

    OPTIMIZING_APPS_NUM_PKGS_DEXOPTED = 402;



    // The number of packages which did not need optimizing during the optimizing apps dialog.

    OPTIMIZING_APPS_NUM_PKGS_SKIPPED = 403;



    // The number of packages which failed to optimize during the optimizing apps dialog.

    OPTIMIZING_APPS_NUM_PKGS_FAILED = 404;



    // The number of optimizable packages in the system.

    OPTIMIZING_APPS_NUM_PKGS_TOTAL = 405;



    // The total amount of time the user was blocked on the optimizing apps dialog.

    OPTIMIZING_APPS_TOTAL_TIME_MS = 406;



    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS

  }

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

+1 −12
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ import com.android.internal.app.IMediaContainerService; 
import com.android.internal.app.ResolverActivity;

import com.android.internal.content.NativeLibraryHelper;

import com.android.internal.content.PackageHelper;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.os.IParcelFileDescriptorFactory;

import com.android.internal.os.InstallerConnection.InstallerException;

import com.android.internal.os.SomeArgs;
@@ -7229,16 +7227,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
        }















        final int elapsedTime = (int) TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime);













        MetricsLogger.action(mContext,













                MetricsEvent.OPTIMIZING_APPS_NUM_PKGS_DEXOPTED, numberOfPackagesOptimized);













        MetricsLogger.action(mContext,













                MetricsEvent.OPTIMIZING_APPS_NUM_PKGS_SKIPPED, numberOfPackagesSkipped);













        MetricsLogger.action(mContext,













                MetricsEvent.OPTIMIZING_APPS_NUM_PKGS_FAILED, numberOfPackagesFailed);













        MetricsLogger.action(mContext,













                MetricsEvent.OPTIMIZING_APPS_NUM_PKGS_TOTAL, getOptimizablePackages().size());













        MetricsLogger.action(mContext,













                MetricsEvent.OPTIMIZING_APPS_TOTAL_TIME_MS, elapsedTime);













        // TODO: Log events using MetricsLogger.histogram / MetricsLogger.count















    }





























    @Override