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

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

Browse Source 
* commit '80b60bbb5efa42acef12843cde0d7a97f800337d':
  Fix NPE when walking the set of packages to update app link policy
This commit is contained in:
Christopher Tate
2015-06-24 19:55:46 +00:00
committed by Android Git Automerger
parent 7b75289202 80b60bbb5e
commit 345f394696
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();
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;