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

Commit 62e94844 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 80b60bbb: Merge "Fix NPE when walking the set of packages to update app... 

am 80b60bbb: Merge "Fix NPE when walking the set of packages to update app link policy" into mnc-dev

* commit '80b60bbb':
  Fix NPE when walking the set of packages to update app link policy
parents b96bc804 80b60bbb

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

+3 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,9 @@ final class Settings { 
        ArraySet<String> currentDomains = current.getIntentFilterVerificationInfo().getDomains();

        if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) {

            for (PackageSetting ps : mPackages.values()) {

                if (ps == null || ps.pkg.packageName.equals(packageName)) continue;

                if (ps == null || ps.pkg == null || packageName.equals(ps.pkg.packageName)) {

                    continue;

                }

                IntentFilterVerificationInfo ivi = ps.getIntentFilterVerificationInfo();

                if (ivi == null) {

                    continue;