Merge "Do not check VNDK from Fastboot test" into main am: 579d1fd027
Original change: https://android-review.googlesource.com/c/platform/test/vts/+/2916505
Change-Id: I611e0d773a5f2725bc5dc6f0cf535d89fb4010cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java b/tests/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
index 16d87a3..80d1220 100644
--- a/tests/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
+++ b/tests/fastboot_getvar/src/com/android/tests/FastbootGetvarUserspaceTest.java
@@ -132,27 +132,6 @@
assertNotNull(osVersion);
}
- /* Devices launching in R and after must export version-vndk. */
- @Test
- public void testVndkVersion() throws Exception {
- String vndkVersion = getTestInformation().getDevice().getFastbootVariable("version-vndk");
- String codeName = sDeviceCodeName.get(getTestInformation().getDevice());
- CLog.d("vndk version: '%s', code name: '%s'", vndkVersion, codeName);
- // The value of vndkVersion might be a letter or a string on pre-release builds,
- // e.g., R or Tiramisu.
- // And it is a number representing the API level on final release builds, e.g., 30.
- if ("REL".equals(codeName)) {
- try {
- int intVndkVersion = Integer.parseInt(vndkVersion);
- assertTrue(intVndkVersion >= PLATFORM_API_LEVEL_R);
- } catch (NumberFormatException nfe) {
- fail("ro.vndk.version should be a number. But the current value is " + vndkVersion);
- }
- } else {
- assertNotNull(vndkVersion);
- }
- }
-
/* Devices launching in R and after must export dynamic-partition. */
@Test
public void testDynamicPartition() throws Exception {
