Merge "mediav2: Limit av1 film grain test to devices launching with V" into main
diff --git a/tests/media/common/src/android/mediav2/common/cts/CodecTestBase.java b/tests/media/common/src/android/mediav2/common/cts/CodecTestBase.java
index b07b816..ed2dc97 100644
--- a/tests/media/common/src/android/mediav2/common/cts/CodecTestBase.java
+++ b/tests/media/common/src/android/mediav2/common/cts/CodecTestBase.java
@@ -137,9 +137,6 @@
public static final boolean VNDK_IS_AT_MOST_U =
SystemProperties.getInt("ro.vndk.version", Build.VERSION_CODES.CUR_DEVELOPMENT)
<= Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
- public static final boolean VNDK_IS_AT_LEAST_V =
- SystemProperties.getInt("ro.vndk.version", Build.VERSION_CODES.CUR_DEVELOPMENT)
- > Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
public static final boolean BOARD_SDK_IS_AT_LEAST_T =
SystemProperties.getInt("ro.board.api_level", Build.VERSION_CODES.CUR_DEVELOPMENT)
>= Build.VERSION_CODES.TIRAMISU;
diff --git a/tests/media/src/android/mediav2/cts/Av1FilmGrainValidationTest.java b/tests/media/src/android/mediav2/cts/Av1FilmGrainValidationTest.java
index 0619646..091f4b3 100644
--- a/tests/media/src/android/mediav2/cts/Av1FilmGrainValidationTest.java
+++ b/tests/media/src/android/mediav2/cts/Av1FilmGrainValidationTest.java
@@ -164,8 +164,8 @@
*/
@Test
public void testAv1FilmGrainRequirement() throws Exception {
- Assume.assumeTrue("Skipping, Only intended for devices with vndk > U",
- VNDK_IS_AT_LEAST_V);
+ Assume.assumeTrue("Skipping, Only intended for devices with SDK >= 202404",
+ BOARD_FIRST_SDK_IS_AT_LEAST_202404);
MediaFormat format = setUpSource(mTestFile);
mImageSurface = new ImageSurface();
setUpSurface(getWidth(format), getHeight(format), ImageFormat.YUV_420_888, 1, 0, null);
