From 74d943ecd632f68b7a480083c8aa9f959630d738 Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Wed, 29 May 2019 21:12:11 +0000 Subject: [PATCH] Revert "Statsd: apex modules in uid map" This reverts commit 631d8f34d6b9b9e185a91141a9a6e8b9ff6190e1. Reason for revert: Increases boot time: b/133850565, b/133774379 Bug: 133774379 Change-Id: Id4b2aa0e3027ba45ef7f81294af4aca6c90aa6ca --- .../java/com/android/server/stats/StatsCompanionService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index 5ed9e6adc105c..de03c4072fa8a 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -489,8 +489,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { // Add in all the apps for every user/profile. for (UserInfo profile : users) { List pi = - pm.getInstalledPackagesAsUser( - PackageManager.MATCH_KNOWN_PACKAGES | PackageManager.MATCH_APEX, + pm.getInstalledPackagesAsUser(PackageManager.MATCH_KNOWN_PACKAGES, profile.id); for (int j = 0; j < pi.size(); j++) { if (pi.get(j).applicationInfo != null) { @@ -2508,7 +2507,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { @Override public void onBootPhase(int phase) { super.onBootPhase(phase); - if (phase == PHASE_BOOT_COMPLETED) { + if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) { mStatsCompanionService.systemReady(); } }