commit b5fb3f6cd072314e572bace895a8ff4f458c8ade
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 08 17:21:09 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 08 17:21:09 2023 +0000
tree 3423b2e638824f8e46c94c385f3a8afe0a0dc46a
parent ecf535c14c3f3d4e4caa5d9795b484c83e7fccd3
parent 1ed518a5df9fe2d66ed2cc9faab13c6fd4301558

Merge "Fix Microdroid boot time tests reporting NaN"

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 419b250..9ec36b3 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -172,7 +172,7 @@
                 String name,
                 StringBuilder result,
                 boolean monitorEvents) {
-            mProcessedBootTimeMetrics = monitorEvents;
+            mProcessedBootTimeMetrics |= monitorEvents;
             new Thread(
                             () -> {
                                 try {
@@ -354,10 +354,6 @@
             return getPayloadStartedNanoTime() - getInitStartedNanoTime();
         }
 
-        public boolean hasProcessedBootTimeMetrics() {
-            return processedBootTimeMetrics;
-        }
-
         public OptionalLong getBootTimeMetricNanoTime(BootTimeMetric metric) {
             if (metric == BootTimeMetric.TOTAL) {
                 return OptionalLong.of(endToEndNanoTime);