Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c8ac37 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am 73c489a9: am e31dad2b: am e4036947: am b298ba48: am dbdf7c45: Don\'t send... 

am 73c489a9: am e31dad2b: am e4036947: am b298ba48: am dbdf7c45: Don\'t send app links to the parent if status = never (part 2)

* commit '73c489a9':
  Don't send app links to the parent if status = never (part 2)
parents a4241839 73c489a9

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

+6 −3
Original line number Diff line number Diff line
@@ -4415,9 +4415,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            synchronized(mPackages) {

                CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(

                        intent, resolvedType, 0, sourceUserId, parent.id);

                return xpDomainInfo != null

                        && xpDomainInfo.bestDomainVerificationStatus !=

                                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;

                return xpDomainInfo != null;

            }

        }

        return false;
@@ -4574,6 +4572,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        result.bestDomainVerificationStatus);

            }

        }

        // Don't consider matches with status NEVER across profiles.

        if (result != null && result.bestDomainVerificationStatus

                == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) {

            return null;

        }

        return result;

    }