Merge "[PackageUsage] fix NPE" into tm-dev am: 6e2b511be4

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

Change-Id: Ibcd4478efc7cb3607369886fc3430fb13b6039c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2022-04-21 13:03:41 +00:00
committed by Automerger Merge Worker

View File

@@ -66,7 +66,8 @@ class PackageUsage extends AbstractStatsBase<Map<String, PackageSetting>> {
out.write(sb.toString().getBytes(StandardCharsets.US_ASCII)); out.write(sb.toString().getBytes(StandardCharsets.US_ASCII));
for (PackageSetting pkgSetting : pkgSettings.values()) { for (PackageSetting pkgSetting : pkgSettings.values()) {
if (pkgSetting.getPkgState().getLatestPackageUseTimeInMills() == 0L) { if (pkgSetting == null || pkgSetting.getPkgState() == null
|| pkgSetting.getPkgState().getLatestPackageUseTimeInMills() == 0L) {
continue; continue;
} }
sb.setLength(0); sb.setLength(0);