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

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

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

Change-Id: If27b7ce9c484aa42d43b7bea4be073beb17da2ba
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:18:54 +00:00
committed by Automerger Merge Worker
parent 6494170599 57dcd372bf
commit 6befdf6883
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageUsage.java
View File

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