Skip AVF tests if GSI && VSR < 202404
Bug: 337591190
Test: watch
Change-Id: I28bac782cf814ce055be5c0675c5bdee93ae3c7b
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 364e769..b2a77a7 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
@@ -48,6 +48,7 @@
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -206,6 +207,11 @@
assume().withMessage("Device doesn't support AVF")
.that(mCtx.getPackageManager().hasSystemFeature(FEATURE_VIRTUALIZATION_FRAMEWORK))
.isTrue();
+ int vendorApiLevel = SystemProperties.getInt("ro.vendor.api_level", 0);
+ boolean isGsi = new File("/system/system_ext/etc/init/init.gsi.rc").exists();
+ assume().withMessage("GSI with vendor API level < 202404 may not support AVF")
+ .that(isGsi && vendorApiLevel < 202404)
+ .isFalse();
}
protected void assumeSupportedDevice() {
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index 203bcae..41ddd48 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -20,6 +20,7 @@
import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
@@ -136,6 +137,15 @@
"Requires VM support",
testDevice.hasFeature("android.software.virtualization_framework"));
assumeTrue("Requires VM support", testDevice.supportsMicrodroid());
+
+ CommandRunner android = new CommandRunner(androidDevice);
+ long vendorApiLevel = androidDevice.getIntProperty("ro.vendor.api_level", 0);
+ boolean isGsi =
+ android.runForResult("[ -e /system/system_ext/etc/init/init.gsi.rc ]").getStatus()
+ == CommandStatus.SUCCESS;
+ assumeFalse(
+ "GSI with vendor API level < 202404 may not support AVF",
+ isGsi && vendorApiLevel < 202404);
}
public static void archiveLogThenDelete(TestLogData logs, ITestDevice device, String remotePath,