commit b1b956b9487648571c5b72b5901720e84220b756
author Jeff Tinker <jtinker@google.com> Fri May 15 18:39:19 2015 -0700
committer Jeff Tinker <jtinker@google.com> Fri May 29 17:05:02 2015 -0700
tree a8d1dd06738a3ebc0076a5bde5f0eae5d4a9f6a8
parent 101b413868afbfb8ec91f0d943c5e743854fbb2a

Add cts coverage for new APIs in M

bug: 21527003

Change-Id: I5e7d730f8455dd16005edac8d2f8c84573a0acb5

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

diff --git a/tests/tests/media/src/android/media/cts/MediaCodecCencPlayer.java b/tests/tests/media/src/android/media/cts/MediaCodecCencPlayer.java
index b96d38c..2473078 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecCencPlayer.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecCencPlayer.java
@@ -248,12 +248,14 @@
 
         if (null == mCrypto && (mEncryptedVideo || mEncryptedAudio)) {
             try {
-                mCrypto = new MediaCrypto(CLEARKEY_SCHEME_UUID, mSessionId);
+                byte[] initData = new byte[0];
+                mCrypto = new MediaCrypto(CLEARKEY_SCHEME_UUID, initData);
             } catch (MediaCryptoException e) {
                 reset();
                 Log.e(TAG, "Failed to create MediaCrypto instance.");
                 throw e;
             }
+            mCrypto.setMediaDrmSession(mSessionId);
         } else {
             reset();
             mCrypto.release();