summaryrefslogtreecommitdiffstats
path: root/drm/drmserver/DrmManager.cpp
Commit message (Expand)AuthorAgeFilesLines
* media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-151-10/+10
* Remove obsolete drm manager codeJeff Tinker2013-07-231-15/+0
* 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-101-2/+2
* Add a new API on DRM Framework for streamingKei Takahashi2012-05-231-0/+30
* Separate sniffing from session initializationJames Dong2012-01-121-4/+7
* 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
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
|/
* 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-251-22/+32
* 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
* | - 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-221-0/+10
|\ \ | |/
| * Update of DRM Framework.Takeshi Aimi2010-11-191-0/+10
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-191-3/+3
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-031-46/+62
|\ \ | |/
| * Update of DRM frameworkTakeshi Aimi2010-11-021-46/+62
* | Disable some logsGloria Wang2010-11-021-1/+0
|/
* Update of DRM framework.Takeshi Aimi2010-10-041-41/+95
* Initial contribution from Sony Corporation.aimitakeshi2010-09-011-0/+473