diff options
author | Jeff Tinker <jtinker@google.com> | 2015-03-16 13:39:29 -0700 |
---|---|---|
committer | Jeff Tinker <jtinker@google.com> | 2015-03-16 15:39:03 -0700 |
commit | d072c909d87f8150433860f6de4c11df6e09e2f9 (patch) | |
tree | 57ddf1e47d3ce322e10214991e01b509aeeb1155 /media/libmedia/IDrm.cpp | |
parent | eb0ee0e842d3b8294aa6c0b797eaf7aff3fd2f89 (diff) | |
download | frameworks_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/libmedia/IDrm.cpp')
-rw-r--r-- | media/libmedia/IDrm.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp index b08fa82..714a0b3 100644 --- a/media/libmedia/IDrm.cpp +++ b/media/libmedia/IDrm.cpp @@ -125,7 +125,8 @@ struct BpDrm : public BpInterface<IDrm> { Vector<uint8_t> const &initData, String8 const &mimeType, DrmPlugin::KeyType keyType, KeyedVector<String8, String8> const &optionalParameters, - Vector<uint8_t> &request, String8 &defaultUrl) { + Vector<uint8_t> &request, String8 &defaultUrl, + DrmPlugin::KeyRequestType *keyRequestType) { Parcel data, reply; data.writeInterfaceToken(IDrm::getInterfaceDescriptor()); @@ -143,6 +144,7 @@ struct BpDrm : public BpInterface<IDrm> { readVector(reply, request); defaultUrl = reply.readString8(); + *keyRequestType = static_cast<DrmPlugin::KeyRequestType>(reply.readInt32()); return reply.readInt32(); } @@ -562,13 +564,15 @@ status_t BnDrm::onTransact( Vector<uint8_t> request; String8 defaultUrl; + DrmPlugin::KeyRequestType keyRequestType; + + status_t result = getKeyRequest(sessionId, initData, mimeType, + keyType, optionalParameters, request, defaultUrl, + &keyRequestType); - status_t result = getKeyRequest(sessionId, initData, - mimeType, keyType, - optionalParameters, - request, defaultUrl); writeVector(reply, request); reply->writeString8(defaultUrl); + reply->writeInt32(static_cast<int32_t>(keyRequestType)); reply->writeInt32(result); return OK; } |