summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <chiuwinson@google.com> 2021-03-08 10:26:44 -0800
committer Winson <chiuwinson@google.com> 2021-03-08 10:28:33 -0800
commitd6598b5e7d65df0bb360ce64ab6f5f47f0821870 (patch)
tree53bc89d1ae1d0a82587f2b951283fd9ce624c613
parent283c3a37ae2a9f6290f1fe09eeae808fe99f8f43 (diff)
Include current profile browsers when resolving cross profile
The resolution logic relies on these being added in order to redirect to ResolverActivity. Then it can use the presence of browsers/absence of apps to determine when to show the new UI. Bug: 174688153 Test: manual, launch work profile intent for personal profile app Change-Id: I60fdb0506d9b1d8068e4f7592b3f5cf5907d92ad
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 3eb3e11149d4..2333b1968688 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2654,13 +2654,10 @@ public class PackageManagerService extends IPackageManager.Stub
// If no apps are approved for the domain, resolve only to browsers
if (approvedInfos.isEmpty()) {
- // If the other profile has a result, include that and delegate to
- // ResolveActivity
+ includeBrowser = true;
if (xpDomainInfo != null && xpDomainInfo.highestApprovalLevel
> DomainVerificationManagerInternal.APPROVAL_LEVEL_NONE) {
result.add(xpDomainInfo.resolveInfo);
- } else {
- includeBrowser = true;
}
} else {
result.addAll(approvedInfos);