summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward...Gloria Wang2011-08-046-183/+257
| |\
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257
* | | Fix ordering assumption of argument evaluation.Gloria Wang2011-08-011-21/+45
* | | Fix for bug 4371230.Gloria Wang2011-07-2512-48/+62
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-114-29/+8
* | | - Add two sanity checks.Gloria Wang2011-06-224-22/+19
* | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."Gloria Wang2011-06-211-0/+13
|\ \ \
| * | | Fix a memory leak in the Forward Lock plugin.Gloria Wang2011-06-211-0/+13
* | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-164-31/+29
|\ \ \ \ | |/ / / |/| | |
| * | | -Fix some typoGloria Wang2011-06-154-31/+29
* | | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
|/ / /
* | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
* | | Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
* | | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the...Gloria Wang2011-03-251-1/+0
|\ \ \ | |/ /
| * | Fix for bug 4126624.Gloria Wang2011-03-241-1/+0
| * | Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
* | | am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change c...Bill Gruber2011-03-2314-466/+589
|\ \ \ | |/ /
| * | 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
* | | | Merge "Include strings.h for the strcasecmp prototype."Carl Shapiro2011-03-221-1/+1
|\ \ \ \
| * | | | Include strings.h for the strcasecmp prototype.Carl Shapiro2011-03-221-1/+1
* | | | | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHa...Gloria Wang2011-03-221-2/+17
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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 4084554.Gloria Wang2011-03-211-188/+88
* | | Fix for bug 4126103.Gloria Wang2011-03-171-2/+2
* | | am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more...Gloria Wang2011-03-174-9/+81
|\ \ \ | |/ /
| * | Fix for 4089881.Gloria Wang2011-03-164-9/+81
* | | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-157-20/+37
|\ \ \
| * | | Bug fixes of DRM framework.Gloria Wang2011-03-157-20/+37
* | | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into...Glenn Kasten2011-03-155-162/+6
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-143-0/+32
* | | | | am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error ev...Gloria Wang2011-03-143-6/+18
|\ \ \ \ \ | |/ / / /
| * | | | For issue 4082089Gloria Wang2011-03-143-6/+18
| |/ / /
* | | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-144-4/+4
* | | | resolved conflicts for merge of c761a80d to masterGloria Wang2011-03-143-7/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-113-7/+3
* | | Fix for bug 3477330Gloria Wang2011-03-104-67/+92
|/ /
* | 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