summaryrefslogtreecommitdiffstats
path: root/drm/mediadrm
Commit message (Collapse)AuthorAgeFilesLines
* Implement MediaCrypto.setMediaDrmSession in clearkey pluginJeff Tinker2015-06-036-18/+48
| | | | | | | | To support adding cts tests for new APIs in M, the clearkey DRM plugin needs to be updated. Change-Id: If672ecec8f570d1dd5130e8e4419d37bd931a9e2 related-to-bug: 21527003
* Add expiration update and keys change eventsJeff Tinker2015-04-091-11/+70
| | | | | | | | In support of unprefixed EME bug: 19771612 bug: 19771431 Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
* Report key request message type for unprefixed EMEJeff Tinker2015-03-164-5/+20
| | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-262-2/+0
|\ | | | | | | | | * commit '64b08d230c94872e014831bdb7b8a323c4b584ec': Remove superfluous OpenSSL include paths.
| * Remove superfluous OpenSSL include paths.Adam Langley2015-01-222-2/+0
| | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
* | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-112-9/+0
|\ \ | |/ | | | | | | * commit '2f702c9bc0d07f5d48f6f50586b1e11d9ac59381': Move to libc++.
| * Move to libc++.Dan Albert2014-11-112-9/+0
| | | | | | | | | | | | | | This also cleans up some makefile cruft. Bug: 15193147 Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
* | Fix build, update mock drm pluginJeff Tinker2014-11-062-0/+27
| | | | | | | | | | | | | | Bug: 18280078 (cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07) Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
* | Add missing secure stop methodsJeff Tinker2014-10-311-0/+10
|/ | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* Fix build break in mock drm plugin buildJeff Tinker2014-08-042-0/+8
| | | | Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
* Allow device to be unprovisionedJeff Tinker2014-08-011-0/+4
| | | | | bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
* Create a single test binary.Edwin Wong2014-07-012-63/+29
| | | | | | | | To run individual test suite, follow the example shown below: adb shell LD_LIBRARY_PATH=/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest --gtest_filter=JsonWebKeyTest.* Change-Id: I8ecc944a734cde351505a7cd8c3997976d74553b
* Fix build target path.Edwin Wong2014-07-012-2/+3
| | | | Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
* Add Unit Tests for ClearKey PluginJohn "Juce" Bruce2014-06-305-2/+665
| | | | Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
* ClearKey Implementation of DRM Plugin APIsJohn "Juce" Bruce2014-07-0117-0/+1070
| | | | | | | Adds shared-object entry points and interface implementations that implement the Android ClearKey DRM Plugin API. Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
* JsonWebKey support.Edwin Wong2014-07-015-0/+729
| | | | | | | | Parses JSON Web Key Set in the response data; extracts and base64 decode key id(s) and key(s). bug: 12035506 Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
* Implement ClearKey Init Data ParserJohn "Juce" Bruce2014-07-013-0/+195
| | | | | | | Implements an object that can convert ISO-CENC or WebM initialization data into a ClearKey license request. Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
* Implement OpenSSL-Based DecryptorJohn "Juce" Bruce2014-07-014-1/+126
| | | | | | Implements an object that does AES-CTR-128 by invoking OpenSSL. Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
* Add ClearKey UtilitiesJohn "Juce" Bruce2014-07-014-0/+138
| | | | | | | Adds some utility functionality that is shared by multiple parts of the ClearKey code. Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
* am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-7/+48
|\ | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-292-7/+48
| | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
* | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
| | | | | | | | Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
* | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-1/+1
|/ | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* Fix MediaDrm cts testsJeff Tinker2013-09-113-0/+899
| | | | | | | | | Moving the build of the mock MediaDrm plugin back to frameworks/av since it can't be installed by cts. b/10668350 Change-Id: Id662bdb0775389b458f86a299392217f2d959422
* fix MediaDrm.isCryptoSchemeSupported(uuid)Jeff Tinker2013-08-283-899/+0
| | | | | | | | | 1. Don't expect plugins to support an empty mimeType in isContentTypeSupported 2. Move the cts test mock drm plugin to the cts tree so it is always used b/10528466 Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
* Add ability to test supported content types to MediaDrmJeff Tinker2013-08-222-0/+9
| | | | | bug: 10244066 Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
* Added CTS test for secure stop APIsJeff Tinker2013-04-161-8/+27
| | | | | | bug: 8604418 Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
* Add liblogYing Wang2013-04-091-1/+1
| | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-1/+25
| | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* MediaDrm API updateJeff Tinker2013-04-012-33/+303
| | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
* Implementing MediaDrm APIsJeff Tinker2013-03-133-0/+577
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6