commit 6c6508889791778075939a0711b9d7c26210fec6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 24 16:43:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 24 16:43:28 2021 +0000
tree c6194872d4d5d29cecce341bc831d250cf0a13e8
parent 06b102a70d5579c954166a33b752ee8149e7936d
parent 8c9b5df98a3597f0cc177c04a4f7bc1d86b3eadc

Merge "Don't try to report non-existent stats" am: 8c9b5df98a

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

Change-Id: Id29d2368b9ee734b870134edcfa65b517d05a801

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

diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index 5d8b75d..6ad43ce 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -51,8 +51,8 @@
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
-import android.os.UserHandle;
 import android.os.Trace;
+import android.os.UserHandle;
 import android.os.WorkSource;
 import android.os.storage.StorageManager;
 import android.util.Log;
@@ -260,7 +260,8 @@
 
                 // Only report metrics for base apk for now.
                 // TODO: add ISA and APK type to metrics.
-                if (pkg.getBaseCodePath().equals(path)) {
+                // OTAPreopt doesn't have stats so don't report in that case.
+                if (pkg.getBaseCodePath().equals(path) && packageStats != null) {
                     Trace.traceBegin(Trace.TRACE_TAG_PACKAGE_MANAGER, "dex2oat-metrics");
                     try {
                         long sessionId = Math.randomLongInternal();