Merge "Remove one test from MediaCodecTest#testCreateInputSurfaceErrors."

1 files changed, 1 insertions, 10 deletions

diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
index d3ab54fb8e0..271c92b4cb8 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
@@ -293,7 +293,7 @@ public class MediaCodecTest extends AndroidTestCase {
      * Tests:
      * <br> calling createInputSurface() before configure() throws exception
      * <br> calling createInputSurface() after start() throws exception
-     * <br> calling createInputSurface() with a non-Surface color format throws exception
+     * <br> calling createInputSurface() with a non-Surface color format is not required to throw exception
      */
     public void testCreateInputSurfaceErrors() {
         if (!supportsCodec(MIME_TYPE, true)) {
@@ -323,16 +323,7 @@ public class MediaCodecTest extends AndroidTestCase {
                 // good
             }
             encoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-
-            try {
-                surface = encoder.createInputSurface();
-                fail("createInputSurface should require COLOR_FormatSurface");
-            } catch (IllegalStateException ise) {
-                // good
-            }
-
             encoder.start();
-
             try {
                 surface = encoder.createInputSurface();
                 fail("createInputSurface should not work post-start");