Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9386aad2 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1aefdf90f21c7dc9256f37810f86858ad308fc42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b29c6071 6e2b511b

services/core/java/com/android/server/pm/PackageUsage.java

+2 −1
Original line number Diff line number Diff line
@@ -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);