From 7bad8fd371daeb0dbf3a28fbde9c74141a194f9f Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Sat, 15 Sep 2018 11:27:58 -0700 Subject: Frameworks: Replace deprecated MetricsLogger usage Update OtaDexoptService to use an instance of MetricsLogger. Test: m Change-Id: I8892430392a9d3b4ca25dd52643d21cab7d36b78 --- .../java/com/android/server/pm/OtaDexoptService.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index 748cf08905bb..77ef63dd5aad 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -63,6 +63,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { private final Context mContext; private final PackageManagerService mPackageManagerService; + private final MetricsLogger metricsLogger; // TODO: Evaluate the need for WeakReferences here. @@ -95,6 +96,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { public OtaDexoptService(Context context, PackageManagerService packageManagerService) { this.mContext = context; this.mPackageManagerService = packageManagerService; + metricsLogger = new MetricsLogger(); } public static OtaDexoptService main(Context context, @@ -443,24 +445,22 @@ public class OtaDexoptService extends IOtaDexopt.Stub { private void performMetricsLogging() { long finalTime = System.nanoTime(); - MetricsLogger.histogram(mContext, "ota_dexopt_available_space_before_mb", + metricsLogger.histogram("ota_dexopt_available_space_before_mb", inMegabytes(availableSpaceBefore)); - MetricsLogger.histogram(mContext, "ota_dexopt_available_space_after_bulk_delete_mb", + metricsLogger.histogram("ota_dexopt_available_space_after_bulk_delete_mb", inMegabytes(availableSpaceAfterBulkDelete)); - MetricsLogger.histogram(mContext, "ota_dexopt_available_space_after_dexopt_mb", + metricsLogger.histogram("ota_dexopt_available_space_after_dexopt_mb", inMegabytes(availableSpaceAfterDexopt)); - MetricsLogger.histogram(mContext, "ota_dexopt_num_important_packages", - importantPackageCount); - MetricsLogger.histogram(mContext, "ota_dexopt_num_other_packages", otherPackageCount); + metricsLogger.histogram("ota_dexopt_num_important_packages", importantPackageCount); + metricsLogger.histogram("ota_dexopt_num_other_packages", otherPackageCount); - MetricsLogger.histogram(mContext, "ota_dexopt_num_commands", dexoptCommandCountTotal); - MetricsLogger.histogram(mContext, "ota_dexopt_num_commands_executed", - dexoptCommandCountExecuted); + metricsLogger.histogram("ota_dexopt_num_commands", dexoptCommandCountTotal); + metricsLogger.histogram("ota_dexopt_num_commands_executed", dexoptCommandCountExecuted); final int elapsedTimeSeconds = (int) TimeUnit.NANOSECONDS.toSeconds(finalTime - otaDexoptTimeStart); - MetricsLogger.histogram(mContext, "ota_dexopt_time_s", elapsedTimeSeconds); + metricsLogger.histogram("ota_dexopt_time_s", elapsedTimeSeconds); } private static class OTADexoptPackageDexOptimizer extends -- cgit v1.2.3-59-g8ed1b