summaryrefslogtreecommitdiffstats
path: root/media/ndk
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-03-16 13:39:29 -0700
committerJeff Tinker <jtinker@google.com>2015-03-16 15:39:03 -0700
commitd072c909d87f8150433860f6de4c11df6e09e2f9 (patch)
tree57ddf1e47d3ce322e10214991e01b509aeeb1155 /media/ndk
parenteb0ee0e842d3b8294aa6c0b797eaf7aff3fd2f89 (diff)
downloadframeworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.zip
frameworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.tar.gz
frameworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.tar.bz2
Report key request message type for unprefixed EME
bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
Diffstat (limited to 'media/ndk')
-rw-r--r--media/ndk/NdkMediaDrm.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index 7a1048c..83a5ba1 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -312,8 +312,10 @@ media_status_t AMediaDrm_getKeyRequest(AMediaDrm *mObj, const AMediaDrmScope *sc
String8(optionalParameters[i].mValue));
}
String8 defaultUrl;
+ DrmPlugin::KeyRequestType keyRequestType;
status_t status = mObj->mDrm->getKeyRequest(*iter, mdInit, String8(mimeType),
- mdKeyType, mdOptionalParameters, mObj->mKeyRequest, defaultUrl);
+ mdKeyType, mdOptionalParameters, mObj->mKeyRequest, defaultUrl,
+ &keyRequestType);
if (status != OK) {
return translateStatus(status);
} else {
@@ -725,4 +727,3 @@ media_status_t AMediaDrm_verify(AMediaDrm *mObj, const AMediaDrmSessionId *sessi
}
} // extern "C"
-