From aaee6c74a50796b6d465f9b0eb1c84ccb34b2f92 Mon Sep 17 00:00:00 2001
From: Jackal Guo <jackalguo@google.com>
Date: Thu, 28 Jan 2021 14:13:10 +0800
Subject: [PATCH] Apply package visibility in getPackageForUid for shared UID
 apps

Add package visibility filtering to the implementation in the branching
for shared UID.

Bug: 167656333
Test: CtsAppEnumerationTestCases
Change-Id: Ic1a40bfad53ac4d9110cef385b771fd7e9ccde3a
---
 .../core/java/com/android/server/pm/PackageManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 68b06989b24e8..a9aa619ab0b0c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3862,7 +3862,8 @@ public class PackageManagerService extends IPackageManager.Stub
                 int i = 0;
                 for (int index = 0; index < N; index++) {
                     final PackageSetting ps = sus.packages.valueAt(index);
-                    if (ps.getInstalled(userId)) {
+                    if (ps.getInstalled(userId)
+                            && !shouldFilterApplicationLocked(ps, callingUid, userId)) {
                         res[i++] = ps.name;
                     }
                 }