Merge "Revert "Statsd: apex modules in uid map"" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-06-01 04:48:58 +00:00
committed by Android (Google) Code Review

View File

@@ -489,8 +489,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
// Add in all the apps for every user/profile. // Add in all the apps for every user/profile.
for (UserInfo profile : users) { for (UserInfo profile : users) {
List<PackageInfo> pi = List<PackageInfo> pi =
pm.getInstalledPackagesAsUser( pm.getInstalledPackagesAsUser(PackageManager.MATCH_KNOWN_PACKAGES,
PackageManager.MATCH_KNOWN_PACKAGES | PackageManager.MATCH_APEX,
profile.id); profile.id);
for (int j = 0; j < pi.size(); j++) { for (int j = 0; j < pi.size(); j++) {
if (pi.get(j).applicationInfo != null) { if (pi.get(j).applicationInfo != null) {
@@ -2513,7 +2512,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
@Override @Override
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
super.onBootPhase(phase); super.onBootPhase(phase);
if (phase == PHASE_BOOT_COMPLETED) { if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {
mStatsCompanionService.systemReady(); mStatsCompanionService.systemReady();
} }
} }