summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
Commit message (Expand)AuthorAgeFilesLines
* media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-10/+10
* More 32-bit onlyGlenn Kasten2014-03-141-0/+2
* Remove obsolete drm manager codeJeff Tinker2013-07-232-20/+0
* Add liblogYing Wang2013-04-091-0/+1
* Fix for not ending up in an eternal loop in DrmManager.Henrik B Andersson2013-01-241-33/+23
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-102-4/+4
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-132-0/+190
|\
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-232-0/+40
|/
* Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-171-15/+1
* AV Android make files changesJames Dong2012-03-281-3/+3
* 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-122-8/+11
* 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-262-31/+31
|/
* Modified loadPlugIns to load from /vendor and /system; skip libraries that ar...Edwin Wong2011-09-211-9/+15
* Fix for bug 4371230.Gloria Wang2011-07-252-24/+34
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-7/+2
* Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
* Merge "Bug fixes of DRM framework."Gloria Wang2011-03-151-1/+0
|\
| * Bug fixes of DRM framework.Gloria Wang2011-03-151-1/+0
* | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into...Glenn Kasten2011-03-152-68/+1
|\ \
| * | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-142-68/+1
* | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-142-0/+30
|/ /
* | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-2/+2
|/
* - Change level of some LOGs from LOGE to LOGV because those logsGloria Wang2011-03-091-2/+29
* To support DRM files without file extensionGloria Wang2011-03-021-1/+4
* Merge "Bug 3229711"Glenn Kasten2011-01-121-1/+1
|\
| * Bug 3229711Glenn Kasten2011-01-111-1/+1
* | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-111-1/+5
|\ \ | |/ |/|
| * DRM Framework bug fixes.Takeshi Aimi2010-11-301-1/+5
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-2/+57
|\ \ | |/
| * Update of DRM Framework.Takeshi Aimi2010-11-192-2/+57
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-192-6/+6
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-032-61/+76
|\ \ | |/
| * Update of DRM frameworkTakeshi Aimi2010-11-022-77/+77
* | Disable some logsGloria Wang2010-11-021-1/+0
* | Do not create drm directory here. Fix for bug 3134576.Gloria Wang2010-10-261-16/+1
|/
* Update of DRM framework.Takeshi Aimi2010-10-043-72/+135
* Make DRM libraries optionalJean-Baptiste Queru2010-09-101-0/+2
* fix buildJean-Baptiste Queru2010-09-091-2/+7
* Initial contribution from Sony Corporation.aimitakeshi2010-09-015-0/+838