summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-08-25 13:01:43 +0100
committerNicolas Prevot <nprevot@google.com>2015-08-25 13:03:37 +0100
commitd34ecae444867b78be06bb5a6b0fb2a66c2e30aa (patch)
treee03e04166558b08c60998cc343db9c9dc0175a12 /services/core
parent2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd (diff)
downloadframeworks_base-d34ecae444867b78be06bb5a6b0fb2a66c2e30aa.zip
frameworks_base-d34ecae444867b78be06bb5a6b0fb2a66c2e30aa.tar.gz
frameworks_base-d34ecae444867b78be06bb5a6b0fb2a66c2e30aa.tar.bz2
Don't set a null filter to a cross-profile ResolveInfo.
ResolverActivity expects the filter not to be null. BUG:23395395 Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f67f3f3..74200cb 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4626,7 +4626,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (result == null) {
result = new CrossProfileDomainInfo();
result.resolveInfo =
- createForwardingResolveInfo(null, sourceUserId, parentUserId);
+ createForwardingResolveInfo(new IntentFilter(), sourceUserId, parentUserId);
result.bestDomainVerificationStatus = status;
} else {
result.bestDomainVerificationStatus = bestDomainVerificationStatus(status,