| commit | 9b310aaf3d8a5fb17f0c9f51b47c1d3d4d096f35 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Jun 17 00:37:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 17 00:37:57 2024 +0000 |
| tree | 1c5b51d24df31544ee2f6fe04f75571abb7733b6 | |
| parent | fa691a1bb05158ef6f65f405831601de4579ed9f [diff] | |
| parent | 11a61cd0991f0ebe1fa46fce3f775a5f591268e5 [diff] |
Merge "Add logs to Microdroid device test" into main am: 11a61cd099 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3133197 Change-Id: Ib1c9441a37e5f41fc807375a77747bf98d33f004 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();