From 67b1e54327e828a39a0706740d3898a8b561a81f Mon Sep 17 00:00:00 2001
From: Howard Ro <yro@google.com>
Date: Thu, 18 Apr 2019 10:31:09 -0700
Subject: [PATCH] Add apex packages to uid_mapping

StatsCompanionService currently only pulls on MATCH_KNOWN_PACKAGES but
we also need to add MATCH_APEX flag option to get apex modules in the
installed packages list.

Bug: 130773130
Test: make + cts
Change-Id: I7205cd58fb3276981f7a6c765e82b39dfb7af7ec
---
 .../java/com/android/server/stats/StatsCompanionService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java
index da9bc1646f4be..7548abbbd9c89 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -455,7 +455,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
         // Add in all the apps for every user/profile.
         for (UserInfo profile : users) {
             List<PackageInfo> pi =
-                    pm.getInstalledPackagesAsUser(PackageManager.MATCH_KNOWN_PACKAGES, profile.id);
+                    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) {
                     String installer;