summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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
* | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert ↵Colin Cross2014-01-281-1/+1
|\ \ | |/ | | | | | | | | | | LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit 'bb9e396d311ea38e958fb5b56efff7aea4eaed82': frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-1/+1
| | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.Robert Shih2013-11-081-0/+1
|/ | | | | Bug: 11534051 Change-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5
* 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
* Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-122/+2
| | | | | | | | | This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
* 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
* Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-2/+122
| | | | | | | | | | | | | | | In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7 (cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
* Add ability to test supported content types to MediaDrmJeff Tinker2013-08-222-0/+9
| | | | | bug: 10244066 Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
* Remove obsolete drm manager codeJeff Tinker2013-07-238-73/+0
| | | | | bug: 9545965 Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
* Added CTS test for secure stop APIsJeff Tinker2013-04-161-8/+27
| | | | | | bug: 8604418 Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
* Add liblogYing Wang2013-04-095-1/+5
| | | | | 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
* Remove unnecessary lib dependencies in the FL makefileHenrik B Andersson2013-01-282-8/+0
| | | | Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
* Fixed bugs where the content of buffer holding keys was cleared using a ↵Hung Nguyen2013-01-252-4/+9
| | | | | | | | wrong size in forward lock Modified by James Dong <jdong@google.com> Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
* Fixed memory leakage in the DRM frameworkHung Nguyen2013-01-243-6/+11
| | | | Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-242-34/+28
| | | | | | | | | | | In the original code a random number is used to get try to find an empty slot in the list of free DRM id's. When you reached the limit of 0xfff id's you ended up in an eternal loop causing ANRs. Updated by James Dong <jdong@google.com>. Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
* Allow DRM client to pass the FD of an open file to the DRM server.Gene Morgan2012-09-201-4/+16
| | | | | | | | | | | | | Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/ This modifies the marshall/unmarshall of IDrmManagerService:: acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey". If tag is present convert string to binary FD, then back to string after passage through the interface's Binder. Relevant bug reports: bug: 6426185 Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
generated by cgit v1.1 at 2024-05-15 15:06:11 +0000