diff options
| author | Christopher Tate <ctate@google.com> | 2015-06-24 12:18:05 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-06-24 12:21:14 -0700 |
| commit | af15d9e755c73d1382cc66fedb30ff1d861b85f0 (patch) | |
| tree | 095d2edd9b095d901be9ef3b67509828e731f61a /services | |
| parent | 6b0f384f0042c21129466c100e20aec1a325a8da (diff) | |
| download | frameworks_base-af15d9e755c73d1382cc66fedb30ff1d861b85f0.zip frameworks_base-af15d9e755c73d1382cc66fedb30ff1d861b85f0.tar.gz frameworks_base-af15d9e755c73d1382cc66fedb30ff1d861b85f0.tar.bz2 | |
Fix NPE when walking the set of packages to update app link policy
Bug 21851441
Change-Id: I3616c5a7e40f5ff9ad9bbfee579a4a2fb2b1f7fd
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 169f6de..dcd7799 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -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; |