Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Tate
2015-06-24 19:45:27 +00:00
committed by Android (Google) Code Review
parent 0633ae7481 af15d9e755
commit 80b60bbb5e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/Settings.java
View File

@@ -1072,7 +1072,9 @@ final class Settings {
ArraySet<String> currentDomains = current.getIntentFilterVerificationInfo().getDomains(); ArraySet<String> currentDomains = current.getIntentFilterVerificationInfo().getDomains();
if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) { if (status == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) {
for (PackageSetting ps : mPackages.values()) { 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(); IntentFilterVerificationInfo ivi = ps.getIntentFilterVerificationInfo();
if (ivi == null) { if (ivi == null) {
continue; continue;