Merge "[Bugfix]fix NullPointException when pkg is null" am: 8dd810b3d6 am: d14460ea9c am: 87c77d13a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308300

Change-Id: I4b3080e3558e624df63d8499e16b10e59e1f8780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-23 17:44:47 +00:00
committed by Automerger Merge Worker

View File

@@ -5593,7 +5593,8 @@ public class ComputerEngine implements Computer {
return PackageInfoUtils.generateProcessInfo(sus.processes, 0);
} else if (settingBase instanceof PackageSetting) {
final PackageSetting ps = (PackageSetting) settingBase;
return PackageInfoUtils.generateProcessInfo(ps.getPkg().getProcesses(), 0);
final AndroidPackage pkg = ps.getPkg();
return pkg == null ? null : PackageInfoUtils.generateProcessInfo(pkg.getProcesses(), 0);
}
return null;
}