summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."Gloria Wang2011-06-211-0/+13
|\ \ \
| * | | Fix a memory leak in the Forward Lock plugin.Gloria Wang2011-06-211-0/+13
* | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-161-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | -Fix some typoGloria Wang2011-06-151-3/+1
* | | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
|/ / /
* | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
* | | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the...Gloria Wang2011-03-251-1/+0
|\ \ \ | |/ /
| * | Fix for bug 4126624.Gloria Wang2011-03-241-1/+0
| * | Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
* | | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-155-18/+36
|\ \ \
| * | | Bug fixes of DRM framework.Gloria Wang2011-03-155-18/+36
* | | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into...Glenn Kasten2011-03-152-92/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-142-92/+3
* | | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-141-0/+2
* | | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-143-3/+3
* | | | resolved conflicts for merge of c761a80d to masterGloria Wang2011-03-142-5/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-112-5/+1