| d556fad7475f4cd05a2199e9716ed8e01aa0ea9b |
06-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build, update mock drm plugin
Bug: 18280078
(cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07)
Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| 3c1285e8f86bd497e14c14fb6df7b42072ef52bd |
31-Oct-2014 |
Jeff Tinker <jtinker@google.com> |
Add missing secure stop methods
b/18053197
b/18076411
Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
learkey/DrmPlugin.h
|
| c2320223222fe4507b6d67f6b8b4001d26c77a9c |
05-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build break in mock drm plugin build
Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| 68b15554f6dca3b056eac517fe5fa2fd4ee80a33 |
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow device to be unprovisioned
bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
learkey/DrmPlugin.h
|
| 4ebf92c0418584f1bb5ab3e83e8398351f4c05e5 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Create a single test binary.
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
learkey/tests/Android.mk
learkey/tests/unit-test.mk
|
| 2421a4ba309f082a83be9b8e385c00cd8e0043f6 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
learkey/Android.mk
learkey/tests/unit-test.mk
|
| 8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f |
23-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Add Unit Tests for ClearKey Plugin
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
learkey/Android.mk
learkey/tests/AesCtrDecryptorUnittest.cpp
learkey/tests/Android.mk
learkey/tests/InitDataParserUnittest.cpp
learkey/tests/unit-test.mk
|
| 1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa |
14-May-2014 |
John "Juce" Bruce <juce@google.com> |
ClearKey Implementation of DRM Plugin APIs
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
learkey/Android.mk
learkey/ClearKeyUUID.cpp
learkey/ClearKeyUUID.h
learkey/CreatePluginFactories.cpp
learkey/CreatePluginFactories.h
learkey/CryptoFactory.cpp
learkey/CryptoFactory.h
learkey/CryptoPlugin.cpp
learkey/CryptoPlugin.h
learkey/DrmFactory.cpp
learkey/DrmFactory.h
learkey/DrmPlugin.cpp
learkey/DrmPlugin.h
learkey/Session.cpp
learkey/Session.h
learkey/SessionLibrary.cpp
learkey/SessionLibrary.h
|
| 7bdf28d2b83e527f474e96b0984d6a3f5eb457f7 |
16-May-2014 |
Edwin Wong <edwinwong@google.com> |
JsonWebKey support.
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug: 12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
learkey/JsonWebKey.cpp
learkey/JsonWebKey.h
learkey/tests/Android.mk
learkey/tests/JsonWebKeyUnittest.cpp
learkey/tests/unit-test.mk
|
| 6b3c1473199927264691bb50445cf0b35c2f8892 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement ClearKey Init Data Parser
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
learkey/Android.mk
learkey/InitDataParser.cpp
learkey/InitDataParser.h
|
| 16dfdcff6e4bb025220b88d5fc132ae48e7cb437 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement OpenSSL-Based Decryptor
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
learkey/AesCtrDecryptor.cpp
learkey/AesCtrDecryptor.h
learkey/Android.mk
learkey/ClearKeyTypes.h
|
| 47a86fb32803a37f03a40e4ea13e1f7db6cd728d |
16-May-2014 |
John "Juce" Bruce <juce@google.com> |
Add ClearKey Utilities
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
learkey/Android.mk
learkey/ClearKeyTypes.h
learkey/Utils.cpp
learkey/Utils.h
|
| f356a123bf966150965a1af1cb9bd6ff2ca020de |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
|
| 68d9d71a792deed75d32fe13febc07c9c12c8449 |
04-Mar-2014 |
Jeff Tinker <jtinker@google.com> |
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug: 12702350
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| f2d170f6790329dd73c61b8704055e1dff4112a2 |
26-Feb-2014 |
Ying Wang <wangying@google.com> |
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
ock/Android.mk
|
| 377b2ec9a2885f9b6405b07ba900a9e3f4349c38 |
03-Feb-2014 |
Kévin PETIT <kevin.petit@arm.com> |
Make frameworks/av 64-bit compatible
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
ock/MockDrmCryptoPlugin.cpp
|
| 34486800a022857b45c3882624449980c5cb6907 |
12-Sep-2013 |
Jeff Tinker <jtinker@google.com> |
Fix MediaDrm cts tests
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
ock/Android.mk
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| ee7e77d55d510725a314d8ed36dc730c21af6173 |
29-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
fix MediaDrm.isCryptoSchemeSupported(uuid)
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
ock/Android.mk
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d |
21-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| 423e33ce6569cb14ecf772e9670208517f7b30c4 |
09-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Added CTS test for secure stop APIs
bug: 8604418
Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
ock/MockDrmCryptoPlugin.cpp
|
| da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ock/Android.mk
|
| c0d5f1f8405de861ed6f1725f26cd6601e7103ab |
02-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Implement async event callout from drm plugin to Java app
Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
ock/MockDrmCryptoPlugin.cpp
|
| 4c63a239c404af1e055e5f9939939ab0fd09d98a |
31-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|
| 441a78d5e224e0d67f9b52fa9adc795c6944159b |
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
ock/Android.mk
ock/MockDrmCryptoPlugin.cpp
ock/MockDrmCryptoPlugin.h
|