diff options
author | Esteban Talavera <etalavera@google.com> | 2015-07-13 09:48:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 09:48:21 +0000 |
commit | 2292160320f29144f8f8f38bd6936e9f1efb4ae5 (patch) | |
tree | b1c14c69f691eef1d54e6deb443593027dbbe48c /services | |
parent | 96d00ab359d60197321f06b4feb3d01f3fa03a29 (diff) | |
parent | 3ec12db0f5155be41d60694f0ac3c9284ff29002 (diff) | |
download | frameworks_base-2292160320f29144f8f8f38bd6936e9f1efb4ae5.zip frameworks_base-2292160320f29144f8f8f38bd6936e9f1efb4ae5.tar.gz frameworks_base-2292160320f29144f8f8f38bd6936e9f1efb4ae5.tar.bz2 |
Merge "Don't send app links to parent profile if status == never" into mnc-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index bfb803d..6da2055 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4431,8 +4431,11 @@ public class PackageManagerService extends IPackageManager.Stub { // cross-profile app linking works only towards the parent. final UserInfo parent = getProfileParent(sourceUserId); synchronized(mPackages) { - return getCrossProfileDomainPreferredLpr(intent, resolvedType, 0, sourceUserId, - parent.id) != null; + CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr( + intent, resolvedType, 0, sourceUserId, parent.id); + return xpDomainInfo != null + && xpDomainInfo.bestDomainVerificationStatus != + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; } } return false; |