summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Fix MediaDrm cts testsJeff Tinker2013-09-113-0/+899
* Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-122/+2
* fix MediaDrm.isCryptoSchemeSupported(uuid)Jeff Tinker2013-08-283-899/+0
* Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-2/+122
* Add ability to test supported content types to MediaDrmJeff Tinker2013-08-222-0/+9
* Remove obsolete drm manager codeJeff Tinker2013-07-238-73/+0
* Added CTS test for secure stop APIsJeff Tinker2013-04-161-8/+27
* Add liblogYing Wang2013-04-095-1/+5
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-1/+25
* MediaDrm API updateJeff Tinker2013-04-012-33/+303
* Implementing MediaDrm APIsJeff Tinker2013-03-133-0/+577
* 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-243-6/+11
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-242-34/+28
* Allow DRM client to pass the FD of an open file to the DRM server.Gene Morgan2012-09-201-4/+16
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-1018-51/+44
* 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-1312-0/+1140
|\
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-1312-0/+1140
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-2312-0/+162
|/
* Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-171-15/+1
* 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-288-20/+16
* 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
|/
* Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+21
* Remove unnecessary header file includes for drmserverJames Dong2012-02-271-5/+0
* Separate sniffing from session initializationJames Dong2012-01-1212-41/+141
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-082-13/+13
* 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
* am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-141-3/+2
|\
| * Revert the following patches because they may lead to power regression becaus...James Dong2011-12-141-3/+2
* | am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ | |/
| * Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
* | Fix log messageGlenn Kasten2011-11-101-1/+4
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-265-100/+100
|/
* Modified loadPlugIns to load from /vendor and /system; skip libraries that ar...Edwin Wong2011-09-211-9/+15
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\