| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove superfluous OpenSSL include paths. | Adam Langley | 2015-01-22 | 4 | -9/+3 |
* | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 1 | -1/+1 |
* | am ac4d8b31: am 6ade0417: Merge "Remove dead code." | Chih-Hung Hsieh | 2014-10-07 | 1 | -8/+0 |
|\ |
|
| * | Remove dead code. | Chih-Hung Hsieh | 2014-10-07 | 1 | -8/+0 |
* | | am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal" | Glenn Kasten | 2014-09-26 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fix comparison of String8 to char* literal | Bernhard Rosenkraenzer | 2014-09-18 | 1 | -1/+1 |
* | | am bb5b41a3: am a018cd49: Merge "Add SELinux MAC to DrmManagerService." | Nick Kralevich | 2014-07-25 | 1 | -0/+19 |
|\ \
| |/ |
|
| * | Add SELinux MAC to DrmManagerService. | Riley Spahn | 2014-07-25 | 1 | -0/+19 |
* | | am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when n... | Adam Lesinski | 2014-06-10 | 6 | -38/+277 |
|\ \ |
|
| * \ | am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service... | Adam Lesinski | 2014-06-09 | 6 | -38/+277 |
| |\ \
| | |/
| |/| |
|
| | * | Implement a NoOp DrmManagerClientImpl when no DRM service exists | Adam Lesinski | 2014-06-06 | 6 | -38/+277 |
* | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 1 | -2/+2 |
|\ \ \
| |/ / |
|
| * | | media: use size_t for integer iterator to Vector::size() | Mark Salyzyn | 2014-04-15 | 1 | -2/+2 |
| |/ |
|
* | | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO... | Colin Cross | 2014-01-28 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH | Colin Cross | 2014-01-27 | 1 | -1/+1 |
* | | Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType. | Robert Shih | 2013-11-08 | 1 | -0/+1 |
|/ |
|
* | Remove obsolete drm manager code | Jeff Tinker | 2013-07-23 | 5 | -28/+0 |
* | Add liblog | Ying Wang | 2013-04-09 | 3 | -0/+3 |
* | Remove unnecessary lib dependencies in the FL makefile | Henrik B Andersson | 2013-01-28 | 2 | -8/+0 |
* | Fixed bugs where the content of buffer holding keys was cleared using a wrong... | Hung Nguyen | 2013-01-25 | 2 | -4/+9 |
* | Fixed memory leakage in the DRM framework | Hung Nguyen | 2013-01-24 | 1 | -1/+2 |
* | Fix for not ending up in an eternal loop in DrmManager. | Henrik B Andersson | 2013-01-24 | 1 | -1/+5 |
* | Let getOriginalMimeType() take a fd passed from drm java applications | James Dong | 2012-08-10 | 14 | -43/+26 |
* | Remove some unused forward lock code | James Dong | 2012-08-08 | 2 | -61/+0 |
* | am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ... | James Dong | 2012-06-13 | 8 | -0/+760 |
|\ |
|
| * | Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/ | James Dong | 2012-06-13 | 8 | -0/+760 |
* | | Add a new API on DRM Framework for streaming | Kei Takahashi | 2012-05-23 | 8 | -0/+66 |
|/ |
|
* | You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a stati... | Ying Wang | 2012-04-09 | 1 | -7/+0 |
* | Removed unnecessary include JNI from two drm Android.mk files | James Dong | 2012-03-28 | 2 | -2/+0 |
* | AV Android make files changes | James Dong | 2012-03-28 | 6 | -14/+10 |
* | Merge "make sure that lower-case mime and file suffix is used to check agains... | James Dong | 2012-03-14 | 1 | -5/+8 |
|\ |
|
| * | make sure that lower-case mime and file suffix is used to check against the s... | James Dong | 2012-03-13 | 1 | -5/+8 |
* | | Merge "Fixed a buffer overflow bug in DrmPassthruPlugin" | James Dong | 2012-03-14 | 1 | -2/+8 |
|\ \ |
|
| * | | Fixed a buffer overflow bug in DrmPassthruPlugin | James Dong | 2012-03-13 | 1 | -2/+8 |
| |/ |
|
* | | Turned off log spamming from DrmPassthruPlugin | James Dong | 2012-03-13 | 1 | -28/+28 |
|/ |
|
* | Merge "Avoid checking supported mime types or file suffixes in multiple places" | James Dong | 2012-03-12 | 3 | -53/+55 |
|\ |
|
| * | Avoid checking supported mime types or file suffixes in multiple places | James Dong | 2012-03-09 | 3 | -53/+55 |
* | | Added an failure log message when the fwdlock engine fails to open a given file. | James Dong | 2012-03-09 | 1 | -1/+8 |
|/ |
|
* | Separate sniffing from session initialization | James Dong | 2012-01-12 | 8 | -24/+96 |
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-08 | 1 | -11/+11 |
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 1 | -2/+2 |
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 2 | -28/+28 |
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE | Steve Block | 2011-10-26 | 1 | -1/+1 |
* | resolved conflicts for merge of 845fdba7 to master | Gloria Wang | 2011-08-04 | 6 | -183/+257 |
|\ |
|
| * | am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward... | Gloria Wang | 2011-08-04 | 6 | -183/+257 |
| |\ |
|
| | * | Bug fixes in OMA DRM v1 Forward Lock Agent | Henrik B Andersson | 2011-08-04 | 6 | -183/+257 |
* | | | Fix for bug 4371230. | Gloria Wang | 2011-07-25 | 7 | -14/+17 |
* | | | Remove the simulator target from all makefiles. | Jeff Brown | 2011-07-11 | 2 | -15/+4 |
* | | | - Add two sanity checks. | Gloria Wang | 2011-06-22 | 1 | -1/+0 |
* | | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217." | Gloria Wang | 2011-06-21 | 1 | -0/+13 |
|\ \ \ |
|