From b69e341f46a0eec47f0d2241e5dcdde0d6d8c7c9 Mon Sep 17 00:00:00 2001 From: Keun young Park Date: Fri, 14 Feb 2020 11:51:39 -0800 Subject: [PATCH] PackageManager: Migrated OTA related metrics to StatsLog - Only covers items collected as boot perfomance metrics Bug: 132691841 Test: check statsd dump Change-Id: Id7447cc4bfdaedf2a43971f22c0f8bc7d9257efc --- .../server/pm/PackageManagerService.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 8c6e6916ec868..157546286256d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -104,6 +104,9 @@ import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO import static com.android.internal.content.NativeLibraryHelper.LIB_DIR_NAME; import static com.android.internal.util.ArrayUtils.emptyIfNull; import static com.android.internal.util.ArrayUtils.filter; +import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_DATA_APP_AVG_SCAN_TIME; +import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_INIT_TIME; +import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_SYSTEM_APP_AVG_SCAN_TIME; import static com.android.server.pm.ComponentResolver.RESOLVE_PRIORITY_SORTER; import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.InstructionSets.getDexCodeInstructionSet; @@ -3020,8 +3023,11 @@ public class PackageManagerService extends IPackageManager.Stub + (systemPackagesCount == 0 ? 0 : systemScanTime / systemPackagesCount) + " , cached: " + cachedSystemApps); if (mIsUpgrade && systemPackagesCount > 0) { - MetricsLogger.histogram(null, "ota_package_manager_system_app_avg_scan_time", - ((int) systemScanTime) / systemPackagesCount); + //CHECKSTYLE:OFF IndentationCheck + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_SYSTEM_APP_AVG_SCAN_TIME, + systemScanTime / systemPackagesCount); + //CHECKSTYLE:ON IndentationCheck } if (!mOnlyCore) { EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_DATA_SCAN_START, @@ -3148,8 +3154,12 @@ public class PackageManagerService extends IPackageManager.Stub + (dataPackagesCount == 0 ? 0 : dataScanTime / dataPackagesCount) + " , cached: " + cachedNonSystemApps); if (mIsUpgrade && dataPackagesCount > 0) { - MetricsLogger.histogram(null, "ota_package_manager_data_app_avg_scan_time", - ((int) dataScanTime) / dataPackagesCount); + //CHECKSTYLE:OFF IndentationCheck + FrameworkStatsLog.write( + FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_DATA_APP_AVG_SCAN_TIME, + dataScanTime / dataPackagesCount); + //CHECKSTYLE:OFF IndentationCheck } } mExpectingBetter.clear(); @@ -3410,8 +3420,10 @@ public class PackageManagerService extends IPackageManager.Stub } mDexManager.load(userPackages); if (mIsUpgrade) { - MetricsLogger.histogram(null, "ota_package_manager_init_time", - (int) (SystemClock.uptimeMillis() - startTime)); + FrameworkStatsLog.write( + FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_INIT_TIME, + SystemClock.uptimeMillis() - startTime); } } // synchronized (mLock) } // synchronized (mInstallLock)