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

2 files changed, 1 insertions, 27 deletions

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index fd4c71e12fb2..c417fe8ae5cc 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -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
   }
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d268e8543f6b..2f83ec4cc299 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -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;
@@ -7223,16 +7221,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