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

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

am e4036947: am b298ba48: am dbdf7c45: Don\'t send app links to the parent if... 

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

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

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

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

            synchronized(mPackages) {

                CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(

                CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(

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

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

                return xpDomainInfo != null

                return xpDomainInfo != null;

                        && xpDomainInfo.bestDomainVerificationStatus !=

                                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;

            }

            }

        }

        }

        return false;

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

                        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;

        return result;

    }

    }