Merge "[Bugfix]fix NullPointException when pkg is null" am: 8dd810b3d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2308300 Change-Id: Idf521ced44c639ae44aa0fb337d8b31857f06a55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -5730,7 +5730,8 @@ public class ComputerEngine implements Computer {
|
|||||||
return PackageInfoUtils.generateProcessInfo(sus.processes, 0);
|
return PackageInfoUtils.generateProcessInfo(sus.processes, 0);
|
||||||
} else if (settingBase instanceof PackageSetting) {
|
} else if (settingBase instanceof PackageSetting) {
|
||||||
final PackageSetting ps = (PackageSetting) settingBase;
|
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;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user