Merge "Populating ResolveInfo.UserHandle for explicit intents resolution." into udc-dev

2023-03-29 11:52:42 +00:00
parent eed16d7a8f 9960437e73
commit 33a026ae3c
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -571,6 +571,7 @@ public class ComputerEngine implements Computer {
                if (!blockInstantResolution && !blockNormalResolution) {
                    final ResolveInfo ri = new ResolveInfo();
                    ri.activityInfo = ai;
+                    ri.userHandle = UserHandle.of(userId);
                    list = new ArrayList<>(1);
                    list.add(ri);
                    PackageManagerServiceUtils.applyEnforceIntentFilterMatching(