diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-08-25 17:39:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-25 17:39:24 +0000 |
| commit | 26b555d42ce2cf78d42ebcc9806447bf83df9318 (patch) | |
| tree | 7414e02b98f2f2edf9e80db1877200d2eae831de | |
| parent | 83d83194c3e68740593800ee2c295247d2bf2e06 (diff) | |
| parent | d34ecae444867b78be06bb5a6b0fb2a66c2e30aa (diff) | |
| download | frameworks_base-26b555d42ce2cf78d42ebcc9806447bf83df9318.zip frameworks_base-26b555d42ce2cf78d42ebcc9806447bf83df9318.tar.gz frameworks_base-26b555d42ce2cf78d42ebcc9806447bf83df9318.tar.bz2 | |
am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit 'd34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
Don't set a null filter to a cross-profile ResolveInfo.
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 |
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 4bb3c1a..e1bd9f9 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, |