Merge "[PackageUsage] fix NPE" into tm-dev

2022-04-21 12:59:45 +00:00
parent e629b8ac9a 714d59fafe
commit 6e2b511be4
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageUsage.java
+++ b/services/core/java/com/android/server/pm/PackageUsage.java
@@ -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);