OSDN Git Service

Don't set a null filter to a cross-profile ResolveInfo.
authorNicolas Prevot <nprevot@google.com>
Tue, 25 Aug 2015 12:01:43 +0000 (13:01 +0100)
committerNicolas Prevot <nprevot@google.com>
Tue, 25 Aug 2015 12:03:37 +0000 (13:03 +0100)
ResolverActivity expects the filter not to be null.

BUG:23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e

services/core/java/com/android/server/pm/PackageManagerService.java

index f67f3f3..74200cb 100644 (file)
@@ -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,