Only runs fastbootd test for VSR-12+ devices
Commits I57ccf2bec1dda573fe3ac628a646624b76f45905 now
reports "fastbootd" for the `fastboot devices` command,
in the fastbootd mode, as opposed to "fastboot" in the
fastboot bootloader mode.
Android 12 VTS now expects "fastbootd" for
testInfo.getDevice().rebootIntoFastbootd(), and will
throw DEVICE_UNAVAILABLE exception if the device
still reports "fastboot". This causes problems for
VSR-11 devices.
Only requires VSR-12+ devices to run fastbootd tests
to fix the issue.
Bug: 214331533
Bug: 215040011
Bug: 216050642
Test: vts-tradefed run commandAndExit vts --primary-abi-only --module FastbootVerifyUserspaceTest
Test: vts-tradefed run commandAndExit vts --primary-abi-only --module FastbootGetvarUserspaceTest
Change-Id: Ie26c4429af41de200c0baaf70aca67d9c8aaaf17
(cherry picked from commit b91c376c368078edf91953b7d28d355aa8764135)
diff --git a/testcases/host/fastboot_getvar/AndroidTest.xml b/testcases/host/fastboot_getvar/AndroidTest.xml
index f3b627e..69d0787 100644
--- a/testcases/host/fastboot_getvar/AndroidTest.xml
+++ b/testcases/host/fastboot_getvar/AndroidTest.xml
@@ -18,7 +18,7 @@
<option name="test-suite-tag" value="apct-junit" />
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController">
- <option name="min-api-level" value="30" />
+ <option name="vsr-min-api-level" value="31" />
</object>
<test class="com.android.tradefed.testtype.HostTest" >
diff --git a/testcases/host/fastboot_test/AndroidTest.xml b/testcases/host/fastboot_test/AndroidTest.xml
index 41b07f2..a6000bb 100644
--- a/testcases/host/fastboot_test/AndroidTest.xml
+++ b/testcases/host/fastboot_test/AndroidTest.xml
@@ -18,7 +18,7 @@
<option name="test-suite-tag" value="apct-junit" />
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController">
- <option name="min-api-level" value="29" />
+ <option name="vsr-min-api-level" value="31" />
<!-- TODO(b/146645516): remove this config after the bug is fixed. -->
<option name="logcat-on-failure" value="false" />
</object>
