Merge "Use product API level, not board API level for tunnel mode behavior tests." into android14-tests-dev am: 09d76a2 am: f724b31 am: 0450bad

Original change: https://android-review.googlesource.com/c/platform/cts/+/2855011

Change-Id: Id938eb31d1f7ee772b6f3507ace876754832b4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Brian3031

tests/tests/media/decoder/src/android/media/decoder/cts/DecodeOnlyTest.java

@@ -74,7 +74,8 @@
 @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
 public class DecodeOnlyTest extends MediaTestBase {
     public static final boolean WAS_LAUNCHED_ON_U_OR_LATER =
-            SystemProperties.getInt("ro.board.first_api_level", Build.VERSION_CODES.CUR_DEVELOPMENT)
+            SystemProperties.getInt("ro.product.first_api_level",
+                                    Build.VERSION_CODES.CUR_DEVELOPMENT)
                     >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
 
     private static final String MEDIA_DIR_STRING = WorkDir.getMediaDirString();
@@ -108,7 +109,7 @@ public void tearDown() {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOnAvc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(AVC_VIDEO, true);
     }
@@ -117,7 +118,7 @@ public void testTunneledPerfectSeekInitialPeekOnAvc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOnVp9() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(VP9_VIDEO, true);
     }
@@ -126,7 +127,7 @@ public void testTunneledPerfectSeekInitialPeekOnVp9() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOnHevc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(HEVC_VIDEO, true);
     }
@@ -135,7 +136,7 @@ public void testTunneledPerfectSeekInitialPeekOnHevc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOffAvc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(AVC_VIDEO, false);
     }
@@ -144,7 +145,7 @@ public void testTunneledPerfectSeekInitialPeekOffAvc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOffVp9() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(VP9_VIDEO, false);
     }
@@ -153,7 +154,7 @@ public void testTunneledPerfectSeekInitialPeekOffVp9() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledPerfectSeekInitialPeekOffHevc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledPerfectSeek(HEVC_VIDEO, false);
     }
@@ -165,7 +166,7 @@ public void testTunneledPerfectSeekInitialPeekOffHevc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledTrickPlayHevc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledTrickPlay(HEVC_VIDEO);
     }
@@ -174,7 +175,7 @@ public void testTunneledTrickPlayHevc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledTrickPlayAvc() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledTrickPlay(AVC_VIDEO);
     }
@@ -183,7 +184,7 @@ public void testTunneledTrickPlayAvc() throws Exception {
     @ApiTest(apis = {"android.media.MediaCodec#BUFFER_FLAG_DECODE_ONLY"})
     public void testTunneledTrickPlayVp9() throws Exception {
         // Tunnel mode requires vendor support of the DECODE_ONLY feature
-        Assume.assumeTrue("First board API level is not Android 14 or later.",
+        Assume.assumeTrue("First API level is not Android 14 or later.",
                 WAS_LAUNCHED_ON_U_OR_LATER);
         testTunneledTrickPlay(VP9_VIDEO);
     }