From d99b14a5e35594f83184e4b0dd9d545c369988c5 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Thu, 14 Jan 2021 11:44:35 +0800
Subject: [PATCH] Pass the correct user id

Pass the current user id so the secondary user won't fail to query
due to lack of INTERACT_ACROSS_USERS.

We will add a test to ensure all users see the same set of modules.

(Cherry-picked from 4421aee5e0c73e4fb99fa705e08e92a2edc20e7e)

Bug: 176152485
Test: N/A, will add a cts
Merged-In: I21b0fa98143f4f1699fe42a37814b3470cea7c1e
Change-Id: I21b0fa98143f4f1699fe42a37814b3470cea7c1e
---
 .../core/java/com/android/server/pm/ModuleInfoProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/ModuleInfoProvider.java b/services/core/java/com/android/server/pm/ModuleInfoProvider.java
index 06706cd06e11f..0ffc1ed9e90cb 100644
--- a/services/core/java/com/android/server/pm/ModuleInfoProvider.java
+++ b/services/core/java/com/android/server/pm/ModuleInfoProvider.java
@@ -184,7 +184,7 @@ public class ModuleInfoProvider {
         List<PackageInfo> allPackages;
         try {
             allPackages = mPackageManager.getInstalledPackages(
-                    flags | PackageManager.MATCH_APEX, UserHandle.USER_SYSTEM).getList();
+                    flags | PackageManager.MATCH_APEX, UserHandle.getCallingUserId()).getList();
         } catch (RemoteException e) {
             Slog.w(TAG, "Unable to retrieve all package names", e);
             return Collections.emptyList();