From 61c4f64f1bb9bc175a92677aa14d510fe62f2ae3 Mon Sep 17 00:00:00 2001 From: Winson Date: Fri, 5 Mar 2021 14:03:12 -0800 Subject: [PATCH] Use correct parentUserId when using cross profile domain verification The targetUserId is actually incorrect. It's marks the user ID it's being launched for, which is the source, not the parent which the Intent is trying to cross into. Bug: 174688153 Test: manual, debug linked issue Change-Id: If822996238f73c6f47fcec239c2c9880925d0afc --- .../core/java/com/android/server/pm/PackageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 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 7da53b50d9276..727f49ed3ebe6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2822,7 +2822,7 @@ public class PackageManagerService extends IPackageManager.Stub result.highestApprovalLevel = Math.max(mDomainVerificationManager .approvalLevelForDomain(ps, intent, resultTargetUser, flags, - riTargetUser.targetUserId), result.highestApprovalLevel); + parentUserId), result.highestApprovalLevel); } if (result != null && result.highestApprovalLevel <= DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {