commit e24ff422aa4fd249207d2ad0fb421114463e3d25
author Shikha Panwar <shikhapanwar@google.com> Wed Sep 28 11:03:24 2022 +0000
committer Shikha Panwar <shikhapanwar@google.com> Wed Sep 28 11:18:27 2022 +0000
tree e0315efaa341f544eb8e2b3f6d818229439864eb
parent 6951dddfccd51cc298e44334760498f3286f8e5a

Revert "bootloader_time should exclude time spent in ABL"

This reverts commit 951fdf97d0d2a412fc57772a6bc4f43eb98b5254.

Test: N/A
Bug: 249462836
Change-Id: Ic94d1a862a2425a6be87757669187b967d8d3625

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 a1dee6d..5dcd77b 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
@@ -282,9 +282,7 @@
         }
 
         private long getKernelStartedNanoTime() {
-            // pvmfw emits log at the end which is used to estimate the kernelStart time.
-            // In case of no pvmfw run(non-protected mode), use vCPU started time instead.
-            return kernelStartedNanoTime.orElse(vcpuStartedNanoTime.getAsLong());
+            return kernelStartedNanoTime.getAsLong();
         }
 
         private long getInitStartedNanoTime() {