diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-08-25 17:57:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-25 17:57:28 +0000 |
| commit | 6fbf2724c2caf4c6dd6c8275b1005a6bf39f2897 (patch) | |
| tree | 950977076eb6e60442295c0519514babf8ad1e48 | |
| parent | b50d5b4cd419bddcdf5559db50298486b0611e9f (diff) | |
| parent | ae2880a62881b08eb692978a869a226fcc692c78 (diff) | |
| download | frameworks_base-6fbf2724c2caf4c6dd6c8275b1005a6bf39f2897.zip frameworks_base-6fbf2724c2caf4c6dd6c8275b1005a6bf39f2897.tar.gz frameworks_base-6fbf2724c2caf4c6dd6c8275b1005a6bf39f2897.tar.bz2 | |
am ae2880a6: am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit 'ae2880a62881b08eb692978a869a226fcc692c78':
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, |