summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug 4126624.Gloria Wang2011-03-241-1/+0
* Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
* Merge "DRM API doc scrub This change contains information contributed by Sony...Bill Gruber2011-03-2314-466/+589
|\
| * DRM API doc scrubBill Gruber2011-03-2314-466/+589
* | Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-2/+17
* | do not merge: Cherry pick change I6529695c from master to partially fix bug 4...Gloria Wang2011-03-211-188/+88
|/
* Fix for 4089881.Gloria Wang2011-03-164-9/+81
* Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-155-162/+6
|\
| * Bug 4016329 do full string comparisonsGlenn Kasten2011-03-145-162/+6
* | For issue 4082089Gloria Wang2011-03-143-6/+18
|/
* - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-113-7/+3
* Merge "- Change level of some LOGs from LOGE to LOGV because those logs are...Gloria Wang2011-03-092-4/+31
|\
| * - Change level of some LOGs from LOGE to LOGV because those logsGloria Wang2011-03-092-4/+31
* | To support uri started with http:// in some Java APIsGloria Wang2011-03-071-0/+5
|/
* Merge "Do not call processDrmInfo if acquireDrmInfo returns null"Gloria Wang2011-03-021-0/+3
|\
| * Do not call processDrmInfo if acquireDrmInfo returns nullGloria Wang2011-03-021-0/+3
* | To support DRM files without file extensionGloria Wang2011-03-022-2/+5
|/
* Move all Widevine code which have dependency on vendor modules to vendor/wide...Gloria Wang2011-02-188-1204/+0
* - Update from WidevineGloria Wang2011-02-188-0/+1204
* Bug 3361124 Remove drmioserver, continuedGlenn Kasten2011-01-214-207/+0
* Bug 3361124 Remove drmioserverGlenn Kasten2011-01-203-132/+0
* am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
|\
| * am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
| |\
| | * More fix for 64 bit offset.Gloria Wang2011-01-191-2/+2
* | | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/Gloria Wang2011-01-181-1/+1
* | | am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock co...Gloria Wang2011-01-1327-0/+5370
|\ \ \ | |/ /
| * | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| |\ \
| | * \ Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| | |\ \
| | | * | Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-0527-0/+5370
* | | | | 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-114-21/+35
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | DRM Framework bug fixes.Takeshi Aimi2010-11-304-21/+35
| |/
* | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-2220-50/+411
|\ \ | |/
| * Update of DRM Framework.Takeshi Aimi2010-11-1920-50/+411
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-1915-59/+59
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-0321-412/+340
|\ \ | |/
| * Update of DRM frameworkTakeshi Aimi2010-11-0221-428/+341
* | Disable some logsGloria Wang2010-11-022-5/+0
* | Add support for WV pluginGloria Wang2010-10-291-0/+27
* | Do not create drm directory here. Fix for bug 3134576.Gloria Wang2010-10-261-16/+1
|/
* Update of DRM framework.Takeshi Aimi2010-10-0429-464/+1173
* There is no @note javadoc tag.Joe Onorato2010-09-161-5/+5
* Make DRM libraries optionalJean-Baptiste Queru2010-09-106-2/+11
* fix buildJean-Baptiste Queru2010-09-092-4/+14
* fix buildJean-Baptiste Queru2010-09-091-2/+7
* fix buildJean-Baptiste Queru2010-09-091-2/+7
* fix buildJean-Baptiste Queru2010-09-091-2/+7
* Initial contribution from Sony Corporation.aimitakeshi2010-09-0155-0/+9321