summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-266-11/+3
|\ | | | | | | | | * commit '64b08d230c94872e014831bdb7b8a323c4b584ec': Remove superfluous OpenSSL include paths.
| * Remove superfluous OpenSSL include paths.Adam Langley2015-01-226-11/+3
| | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-3/+2
|\ \ | |/ | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-3/+2
| | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | 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
| * am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| |\ | | | | | | | | | | | | * commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38': Remove dead code.
| * \ am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d': Fix comparison of String8 to char* literal
| * \ \ am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '9707ffaf0b574b7929d62b2fe683595e95ef7774': Check for NULL before calling asBinder().
* | \ \ \ am 3b97d9d7: am d556fad7: Fix build, update mock drm pluginJeff Tinker2014-11-072-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979': Fix build, update mock drm plugin
| * | | | | Fix build, update mock drm pluginJeff Tinker2014-11-062-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18280078 (cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07) Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
* | | | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into ↵Jeff Tinker2014-11-061-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe': Add missing secure stop methods
| * | | | | Add missing secure stop methodsJeff Tinker2014-10-311-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* | | | | | am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38': Remove dead code.
| * | | | | Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | BUG: 17364950 Change-Id: I7c55fd918a8c0d1a3375807eaece9ae9176ffeea
* | | | | am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d': Fix comparison of String8 to char* literal
| * | | | Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang (correctly) interprets if ("." == sName) as if ("." == (const char*)sName) and recognizes that comparing the pointers isn't what was meant. With if (sName == ".") both clang and gcc see and use String8::operator==(const char *), ensuring we get the wanted behavior. Change-Id: Ide240e13214a56f6899f72de3db75dac647e6d4b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."Dan Albert2014-09-221-1/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * commit '9707ffaf0b574b7929d62b2fe683595e95ef7774': Check for NULL before calling asBinder().
| * | | Check for NULL before calling asBinder().Dan Albert2014-09-161-1/+2
| |/ / | | | | | | | | | | | | | | | The old asBinder() checked if this == NULL, which is undefined behavior. Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
* | | am c2320223: Fix build break in mock drm plugin buildJeff Tinker2014-08-042-0/+8
|\ \ \ | | |/ | |/| | | | | | | * commit 'c2320223222fe4507b6d67f6b8b4001d26c77a9c': Fix build break in mock drm plugin build
| * | Fix build break in mock drm plugin buildJeff Tinker2014-08-042-0/+8
| | | | | | | | | | | | Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
* | | am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-041-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'b63d63b8afa25694d1973988d7acdfebcd01a18d': Allow device to be unprovisioned
| * | Allow device to be unprovisionedJeff Tinker2014-08-011-0/+4
| | | | | | | | | | | | | | | bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
* | | am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-253-13/+91
|\ \ \ | |/ / |/| / | |/ | | * commit 'bb5b41a39f7e93a8df444ae0a1c71495531d265e': Add SELinux MAC to DrmManagerService.
| * Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
| | | | | | | | | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
| * Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
| | | | | | | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
* | 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
* | Fix Externally reported security issueJeff Tinker2014-06-201-1/+12
| | | | | | | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
* | am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when ↵Adam Lesinski2014-06-106-38/+277
|\ \ | | | | | | | | | | | | | | | | | | no DRM service exists" into klp-modular-dev * commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca': Implement a NoOp DrmManagerClientImpl when no DRM service exists
| * \ am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM ↵Adam Lesinski2014-06-096-38/+277
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | service exists" into klp-modular-dev * commit '940f8be3619cecda66dad33f995904795df88c2d': Implement a NoOp DrmManagerClientImpl when no DRM service exists
| | * | Implement a NoOp DrmManagerClientImpl when no DRM service existsAdam Lesinski2014-06-066-38/+277
| | | | | | | | | | | | | | | | Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
* | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-153-14/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-153-14/+14
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-153-14/+14
| | | | | | | | | | | | | | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
* | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-012-7/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * | | 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
* | | am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '9a9481f89b26211b20d7f3fde3d54b455843bf70': More 32-bit only
| * | More 32-bit onlyGlenn Kasten2014-03-141-0/+2
| | | | | | | | | | | | Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
* | | am e0a76795: am 5969b408: Merge "Use multilib-friendly ↵Ying Wang2014-02-261-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_MODULE_RELATIVE_PATH" * commit 'e0a76795125a81471c408d4a23112e98ae2f0ae3': Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
| * | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
| | | | | | | | | | | | Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
generated by cgit v1.1 at 2024-04-27 23:57:42 +0000