1 files changed, 13 insertions, 1 deletions
diff --git a/tests/tests/mediacujtest/smalltest/src/android/media/cujsmalltest/cts/CtsMediaShortFormPlaybackTest.java b/tests/tests/mediacujtest/smalltest/src/android/media/cujsmalltest/cts/CtsMediaShortFormPlaybackTest.java
index 717d27c7a35..74d552e8667 100644
--- a/tests/tests/mediacujtest/smalltest/src/android/media/cujsmalltest/cts/CtsMediaShortFormPlaybackTest.java
+++ b/tests/tests/mediacujtest/smalltest/src/android/media/cujsmalltest/cts/CtsMediaShortFormPlaybackTest.java
@@ -19,6 +19,7 @@ package android.media.cujsmalltest.cts;
 import android.media.cujcommon.cts.CujTestBase;
 import android.media.cujcommon.cts.CujTestParam;
 import android.media.cujcommon.cts.DeviceLockTestPlayerListener;
+import android.media.cujcommon.cts.LockPlaybackControllerTestPlayerListener;
 import android.media.cujcommon.cts.OrientationTestPlayerListener;
 import android.media.cujcommon.cts.PinchToZoomTestPlayerListener;
 import android.media.cujcommon.cts.PipModeTestPlayerListener;
@@ -155,6 +156,10 @@ public class CtsMediaShortFormPlaybackTest extends CujTestBase {
             .setTimeoutMilliSeconds(45000)
             .setPlayerListener(new DeviceLockTestPlayerListener(3000, true)).build(),
             "Mp3_15sec_DeviceLockTest"},
+        {CujTestParam.builder().setMediaUrls(prepareMp3_15secAudioListForDeviceLockTest())
+            .setTimeoutMilliSeconds(50000)
+            .setPlayerListener(new LockPlaybackControllerTestPlayerListener(6000)).build(),
+            "Hevc_720p_15sec_LockPlaybackTest"},
     }));
     return exhaustiveArgsList;
   }
@@ -286,6 +291,9 @@ public class CtsMediaShortFormPlaybackTest extends CujTestBase {
   @Test
   @PlatinumTest(focusArea = "media")
   public void testVideoPlayback() throws Exception {
+    /* TODO(b/339628718, b/338342633) */
+    Assume.assumeFalse("Split screen test is skipped",
+        mCujTestParam.playerListener().isSplitScreenTest());
     if (mCujTestParam.playerListener().isOrientationTest()) {
       Assume.assumeTrue("Skipping " + mTestType + " as device doesn't support orientation change.",
           !OrientationTestPlayerListener.getIgnoreOrientationRequest()
@@ -304,7 +312,11 @@ public class CtsMediaShortFormPlaybackTest extends CujTestBase {
           deviceSupportPipMode(mActivity));
     }
     if (mCujTestParam.playerListener().isSplitScreenTest()) {
-      Assume.assumeFalse("Skipping " + mTestType + " on television", isTelevisionDevice(mActivity));
+      Assume.assumeTrue("Skipping " + mTestType + " as device doesn't support split screen feature",
+          deviceSupportSplitScreenMode(mActivity));
+    }
+    if (mCujTestParam.playerListener().getTestType()
+        .equals(TestType.LOCK_PLAYBACK_CONTROLLER_TEST)) {
       Assume.assumeFalse("Skipping " + mTestType + " on watch", isWatchDevice(mActivity));
     }
     if (mCujTestParam.playerListener().getTestType().equals(TestType.DEVICE_LOCK_TEST)) {