From 64e61d78118fc6ffa8145c589531a079367a2920 Mon Sep 17 00:00:00 2001
From: Rhed Jao <rhedjao@google.com>
Date: Thu, 12 Aug 2021 18:01:48 +0800
Subject: [PATCH] Fix incorrect user id  when applying default preferred
 activity

Bug: 187342358
Test: atest PackageManagerTest
Test: atest CtsDevicePolicyTestCases
Change-Id: I79bc03fccc09ccbee58334c55fdada833bafeac9
---
 services/core/java/com/android/server/pm/Settings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 902263a938333..a854aa0562386 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -3288,7 +3288,7 @@ public final class Settings implements Watchable, Snappable {
             IntentFilter.AuthorityEntry auth, PatternMatcher path, int userId) {
         final List<ResolveInfo> ri =
                 pmInternal.queryIntentActivities(
-                        intent, intent.getType(), flags, Binder.getCallingUid(), 0);
+                        intent, intent.getType(), flags, Binder.getCallingUid(), userId);
         if (PackageManagerService.DEBUG_PREFERRED) {
             Log.d(TAG, "Queried " + intent + " results: " + ri);
         }