From 631d8f34d6b9b9e185a91141a9a6e8b9ff6190e1 Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Wed, 22 May 2019 22:23:31 -0700 Subject: [PATCH] Statsd: apex modules in uid map Fetch apex modules when getting all uids. Also moves the fetch from third party apps can run to on boot completed to avoid increasing boot time. This has some risk in that non-AID modules that log to statsd will get dropped until boot completes, as we check the uidmap for whitelisting of non-AID modules. Test: adb shell cmd stats print-uid-map contains apex (tzdata, resolv) Test: statsd_test Test: atest google/perf/boottime/boottime-test -v Bug: 130773130 Change-Id: I7c48b661f05a28a9b81036cf02ca36bb092a5743 --- .../java/com/android/server/stats/StatsCompanionService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index de03c4072fa8a..5ed9e6adc105c 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -489,7 +489,8 @@ 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, + pm.getInstalledPackagesAsUser( + PackageManager.MATCH_KNOWN_PACKAGES | PackageManager.MATCH_APEX, profile.id); for (int j = 0; j < pi.size(); j++) { if (pi.get(j).applicationInfo != null) { @@ -2507,7 +2508,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { @Override public void onBootPhase(int phase) { super.onBootPhase(phase); - if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) { + if (phase == PHASE_BOOT_COMPLETED) { mStatsCompanionService.systemReady(); } }