diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-08-22 23:08:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-22 23:08:10 +0000 |
| commit | 62c1a46eec047eb5fbc4b90432ec1ce65b76fb75 (patch) | |
| tree | dce59b6f085880d667534b7190df11d1c52b6343 /media/libmedia | |
| parent | 4b820b0e1fa069714b123fc35784541d0f94d267 (diff) | |
| parent | 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d (diff) | |
| download | frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.zip frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.tar.gz frameworks_av-62c1a46eec047eb5fbc4b90432ec1ce65b76fb75.tar.bz2 | |
Merge "Add ability to test supported content types to MediaDrm" into klp-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IDrm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp index 902aeb2..f7a9a75 100644 --- a/media/libmedia/IDrm.cpp +++ b/media/libmedia/IDrm.cpp @@ -68,10 +68,11 @@ struct BpDrm : public BpInterface<IDrm> { return reply.readInt32(); } - virtual bool isCryptoSchemeSupported(const uint8_t uuid[16]) { + virtual bool isCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeType) { Parcel data, reply; data.writeInterfaceToken(IDrm::getInterfaceDescriptor()); data.write(uuid, 16); + data.writeString8(mimeType); remote()->transact(IS_CRYPTO_SUPPORTED, data, &reply); return reply.readInt32() != 0; @@ -438,7 +439,9 @@ status_t BnDrm::onTransact( CHECK_INTERFACE(IDrm, data, reply); uint8_t uuid[16]; data.read(uuid, sizeof(uuid)); - reply->writeInt32(isCryptoSchemeSupported(uuid)); + String8 mimeType = data.readString8(); + reply->writeInt32(isCryptoSchemeSupported(uuid, mimeType)); + return OK; } |