commit 11a61cd0991f0ebe1fa46fce3f775a5f591268e5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 17 00:31:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 00:31:04 2024 +0000
tree e7e3b943ac2b8d696a12e78e058e5c18c4b12162
parent d05e4d2825fe226a6b0471f6ddcd32313868aca3
parent 557cc65eb43733df26e40b430e3a652b6e211067

Merge "Add logs to Microdroid device test" into main

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 e02db39..6474965 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
@@ -20,8 +20,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.TruthJUnit.assume;
 
-import static org.junit.Assume.assumeTrue;
 import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Instrumentation;
 import android.app.UiAutomation;
@@ -213,6 +213,7 @@
                 .isTrue();
         int vendorApiLevel = getVendorApiLevel();
         boolean isGsi = new File("/system/system_ext/etc/init/init.gsi.rc").exists();
+        Log.i(TAG, "isGsi = " + isGsi + ", vendor api level = " + vendorApiLevel);
         assume().withMessage("GSI with vendor API level < 202404 may not support AVF")
                 .that(isGsi && vendorApiLevel < 202404)
                 .isFalse();