summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework
Commit message (Expand)AuthorAgeFilesLines
* FwdLockConv.c: include what you use.Adam Langley2015-05-131-0/+1
* Remove superfluous OpenSSL include paths.Adam Langley2015-01-224-9/+3
* Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-1/+1
* am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
|\
| * Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
* | am 3a94ca56: am fc36efee: 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
* | am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-251-0/+19
|\ \ | |/
| * Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-251-0/+19
* | am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when n...Adam Lesinski2014-06-106-38/+277
|\ \
| * \ am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service...Adam Lesinski2014-06-096-38/+277
| |\ \ | | |/ | |/|
| | * Implement a NoOp DrmManagerClientImpl when no DRM service existsAdam Lesinski2014-06-066-38/+277
* | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-2/+2
|\ \ \ | |/ /
| * | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-2/+2
| |/
* | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO...Colin Cross2014-01-281-1/+1
|\ \ | |/
| * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-1/+1
* | Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.Robert Shih2013-11-081-0/+1
|/
* Remove obsolete drm manager codeJeff Tinker2013-07-235-28/+0
* Add liblogYing Wang2013-04-093-0/+3
* Remove unnecessary lib dependencies in the FL makefileHenrik B Andersson2013-01-282-8/+0
* Fixed bugs where the content of buffer holding keys was cleared using a wrong...Hung Nguyen2013-01-252-4/+9
* Fixed memory leakage in the DRM frameworkHung Nguyen2013-01-241-1/+2
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-241-1/+5
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-1014-43/+26
* Remove some unused forward lock codeJames Dong2012-08-082-61/+0
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-138-0/+760
|\
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-138-0/+760
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-238-0/+66
|/
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a stati...Ying Wang2012-04-091-7/+0
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
* AV Android make files changesJames Dong2012-03-286-14/+10
* Merge "make sure that lower-case mime and file suffix is used to check agains...James Dong2012-03-141-5/+8
|\
| * make sure that lower-case mime and file suffix is used to check against the s...James Dong2012-03-131-5/+8
* | 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
| |/
* | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
|/
* 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
* | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
|/
* Separate sniffing from session initializationJames Dong2012-01-128-24/+96
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-11/+11
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward...Gloria Wang2011-08-046-183/+257
| |\
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257
* | | Fix for bug 4371230.Gloria Wang2011-07-257-14/+17
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-112-15/+4
* | | - Add two sanity checks.Gloria Wang2011-06-221-1/+0