Revert^2 "bootloader_time should exclude time spent in ABL"
It will only include time of pvmfw stage. ABL is being removed from
boot flow.
This reverts commit e24ff422aa4fd249207d2ad0fb421114463e3d25
Bug: 240235424
Test: atest MicrodroidBenchmarks#testMicrodroidBootTime
Change-Id: Iac5ea2a56b9b16adc0d3250250bf191fdf99a330
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 5dcd77b..a1dee6d 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,7 +282,9 @@
}
private long getKernelStartedNanoTime() {
- return kernelStartedNanoTime.getAsLong();
+ // 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());
}
private long getInitStartedNanoTime() {