From 8979ff52f0dbaa5d874fe091deb904fdc438e4da Mon Sep 17 00:00:00 2001
From: Howard Ro <yro@google.com>
Date: Tue, 23 Apr 2019 18:59:33 +0000
Subject: [PATCH] Revert "Add apex packages to uid_mapping"

This reverts commit 67b1e54327e828a39a0706740d3898a8b561a81f.

Bug: 131167067
Reason for revert: b/131167067

Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5
---
 .../java/com/android/server/stats/StatsCompanionService.java   | 3 +--
 1 file changed, 1 insertion(+), 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 7548abbbd9c89..da9bc1646f4be 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -455,8 +455,7 @@ 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
-                            | PackageManager.MATCH_APEX, profile.id);
+                    pm.getInstalledPackagesAsUser(PackageManager.MATCH_KNOWN_PACKAGES, profile.id);
             for (int j = 0; j < pi.size(); j++) {
                 if (pi.get(j).applicationInfo != null) {
                     String installer;