summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework
Commit message (Collapse)AuthorAgeFilesLines
* FwdLockConv.c: include what you use.Adam Langley2015-05-131-0/+1
| | | | | | | | | | | | | | This file needs stdlib.h for malloc, free and realloc, but was previously getting it only via the OpenSSL headers that it was including. BoringSSL, in the future, will be tider about what it includes via its headers and so this file will need to include stdlib.h itself. (cherry picked from commit 2544611b6f37e69955fe7161995b7bacf3ae8fba) Bug: 21085331 Change-Id: I864c679ba5a9f0041dd49d063ad1190ffa87b30a
* Remove superfluous OpenSSL include paths.Adam Langley2015-01-224-9/+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
* Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-1/+1
| | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* 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
| * 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 bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-251-0/+19
|\ \ | |/ | | | | | | * commit 'bb5b41a39f7e93a8df444ae0a1c71495531d265e': Add SELinux MAC to DrmManagerService.
| * Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-251-0/+19
| | | | | | | | | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
* | 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-151-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': 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-151-2/+2
| |/ | | | | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
* | 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
* Remove obsolete drm manager codeJeff Tinker2013-07-235-28/+0
| | | | | bug: 9545965 Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
* Add liblogYing Wang2013-04-093-0/+3
| | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* 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-241-1/+2
| | | | Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-241-1/+5
| | | | | | | | | | | 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
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-1014-43/+26
| | | | | | | | | This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
* Remove some unused forward lock codeJames Dong2012-08-082-61/+0
| | | | Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-138-0/+760
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-138-0/+760
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-238-0/+66
|/ | | | | | | | | | | | In case of DRM streaming, decrypt session can start just after receiving the header, and it doesn't need to wait for the entire content. However, current API of DRM framework only accepts file handle or URI. With this new API, DRM session can start without waiting for the entire content. Changes are made by SEMC and Sony. Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a ↵Ying Wang2012-04-091-7/+0
| | | | | | static library. Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
| | | | Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
* AV Android make files changesJames Dong2012-03-286-14/+10
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Merge "make sure that lower-case mime and file suffix is used to check ↵James Dong2012-03-141-5/+8
|\ | | | | | | against the supported ones"
| * make sure that lower-case mime and file suffix is used to check against the ↵James Dong2012-03-131-5/+8
| | | | | | | | | | | | supported ones Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
* | Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"James Dong2012-03-141-2/+8
|\ \
| * | Fixed a buffer overflow bug in DrmPassthruPluginJames Dong2012-03-131-2/+8
| |/ | | | | | | Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
* | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
|/ | | | Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
* Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong2012-03-123-53/+55
|\
| * Avoid checking supported mime types or file suffixes in multiple placesJames Dong2012-03-093-53/+55
| | | | | | | | Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
* | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
|/ | | | Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
* Separate sniffing from session initializationJames Dong2012-01-128-24/+96
| | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-11/+11
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\ | | | | | | Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 ↵Gloria Wang2011-08-046-183/+257
| |\ | | | | | | | | | | | | | | | | | | Forward Lock Agent" * commit '8a6fb50d69ec40a413b117bc9145a97ec427852f': Bug fixes in OMA DRM v1 Forward Lock Agent
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of fixes in the Forward Lock Agent. The DRM Framework isn't thread safe so the Forward Lock Agent needs to protect the private structures. Base64-encoded content with LF-only instead of CRLF line breaks is now accepted. A fix for non-standard boundary characters. The debug prints are also turned off as default. Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
* | | Fix for bug 4371230.Gloria Wang2011-07-257-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-112-15/+4
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* | | - Add two sanity checks.Gloria Wang2011-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
generated by cgit v1.1 at 2024-05-09 18:05:30 +0000