commit 1cc2c69281b367378287f711fbd8264bc31b479d
author Jason Parks <jparks@google.com> Thu Sep 03 22:02:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 22:02:49 2015 +0000
tree 19683f9c66a12415595d6da3f66af83e376a0200
parent c0c229b7d21d6b621a13dee37a77e4a6174f1cd7
parent aea823b0eb88a585e66019202945316a33a8934c

am aea823b0: Fix failure in testMuxer().

* commit 'aea823b0eb88a585e66019202945316a33a8934c':
  Fix failure in testMuxer().

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

diff --git a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
index 76620c1..81c5113 100644
--- a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
@@ -406,6 +406,10 @@
     }
 
     private void testMuxer(int res, boolean webm) throws Exception {
+        if (!supportsPlayback(res)) {
+            Log.i(TAG, "SKIPPING testMuxer() resid=" + res + " Unsupported decorder.");
+            return;
+        }
         AssetFileDescriptor infd = mResources.openRawResourceFd(res);
 
         File base = mContext.getExternalFilesDir(null);