commit 3cf7b7eebd2c5ecf81ac6bd8ad86fdb3646ccf6f
author Tim Kryger <tkryger@google.com> Fri Sep 08 16:52:26 2017 -0700
committer Tim Kryger <tkryger@google.com> Mon Sep 11 22:03:49 2017 +0000
tree e42959277cecc1a3756d456adee3e1f1fc20e233
parent 78224d94d8d6e679763d64a9bef5ce59e46d98ce

Skip testCryptoError if no MIME_TYPE codec

Allow testing to proceed even if some codecs are not available.

Bug: 63141115
Test: Ran on device without codec and observed test passes
Change-Id: Ie4d9d6063b4094d606a681fdb33e6e620b994c8d

tests/tests/media/src/android/media/cts/MediaCodecTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
index afe5019..61298e8 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
@@ -1757,6 +1757,11 @@
      * <br> getInputBuffer() after the failed queueSecureInputBuffer() succeeds.
      */
     public void testCryptoError() throws Exception {
+        if (!supportsCodec(MIME_TYPE, true)) {
+            Log.i(TAG, "No encoder found for mimeType= " + MIME_TYPE);
+            return;
+        }
+
         MediaDrm drm = new MediaDrm(CLEARKEY_SCHEME_UUID);
         byte[] sessionId = drm.openSession();
         MediaCrypto crypto = new MediaCrypto(CLEARKEY_SCHEME_UUID, new byte[0]);