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

Merge "pm: Modify getPackage() to only return non-null packages" into pi-dev

Browse Source
This commit is contained in:
Jeffrey Vander Stoep
2018-03-08 08:27:44 +00:00
committed by Android (Google) Code Review
parent 7184e28b3a 0a4c63f958
commit b1464cd4f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/SharedUserSetting.java
View File

@@ -105,7 +105,7 @@ public final class SharedUserSetting extends SettingBase {
} }
final ArrayList<PackageParser.Package> pkgList = new ArrayList<>(packages.size()); final ArrayList<PackageParser.Package> pkgList = new ArrayList<>(packages.size());
for (PackageSetting ps : packages) { for (PackageSetting ps : packages) {
if (ps == null) { if ((ps == null) || (ps.pkg == null)) {
continue; continue;
} }
pkgList.add(ps.pkg); pkgList.add(ps.pkg);