Merge "Add cts coverage for new APIs in M" into mnc-dev
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();