| Commit message (Expand) | Author | Age | Files | Lines |
* | resolved conflicts for merge of 845fdba7 to master | Gloria Wang | 2011-08-04 | 6 | -183/+257 |
|\ |
|
| * | am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward... | Gloria Wang | 2011-08-04 | 6 | -183/+257 |
| |\ |
|
| | * | Bug fixes in OMA DRM v1 Forward Lock Agent | Henrik B Andersson | 2011-08-04 | 6 | -183/+257 |
* | | | Fix for bug 4371230. | Gloria Wang | 2011-07-25 | 7 | -14/+17 |
* | | | Remove the simulator target from all makefiles. | Jeff Brown | 2011-07-11 | 2 | -15/+4 |
* | | | - Add two sanity checks. | Gloria Wang | 2011-06-22 | 1 | -1/+0 |
* | | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217." | Gloria Wang | 2011-06-21 | 1 | -0/+13 |
|\ \ \ |
|
| * | | | Fix a memory leak in the Forward Lock plugin. | Gloria Wang | 2011-06-21 | 1 | -0/+13 |
* | | | | Merge "-Fix some typo -Remove one unnecessary memory allocation" | Gloria Wang | 2011-06-16 | 1 | -3/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | -Fix some typo | Gloria Wang | 2011-06-15 | 1 | -3/+1 |
* | | | | To remove log spam in the Forward Lock DRM plugin. | Gloria Wang | 2011-06-14 | 1 | -30/+30 |
|/ / / |
|
* | | | Duplicated fileDesc is not closed when input file is not forward-lock content. | Gloria Wang | 2011-06-13 | 1 | -1/+4 |
* | | | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the... | Gloria Wang | 2011-03-25 | 1 | -1/+0 |
|\ \ \
| |/ / |
|
| * | | Fix for bug 4126624. | Gloria Wang | 2011-03-24 | 1 | -1/+0 |
| * | | Fix for bug 4165823. | Gloria Wang | 2011-03-24 | 2 | -10/+34 |
* | | | Merge "Bug fixes of DRM framework." | Gloria Wang | 2011-03-15 | 5 | -18/+36 |
|\ \ \ |
|
| * | | | Bug fixes of DRM framework. | Gloria Wang | 2011-03-15 | 5 | -18/+36 |
* | | | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into... | Glenn Kasten | 2011-03-15 | 2 | -92/+3 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Bug 4016329 do full string comparisons | Glenn Kasten | 2011-03-14 | 2 | -92/+3 |
* | | | | Add memory leak tracking/debugging code to drm server | James Dong | 2011-03-14 | 1 | -0/+2 |
* | | | | frameworks/base: remove LOCAL_PRELINK_MODULE | Iliyan Malchev | 2011-03-14 | 3 | -3/+3 |
* | | | | resolved conflicts for merge of c761a80d to master | Gloria Wang | 2011-03-14 | 2 | -5/+1 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| * | | - Some change on the DrmManager in order to support feature request 4082089. | Gloria Wang | 2011-03-11 | 2 | -5/+1 |
* | | | Fix for bug 3477330 | Gloria Wang | 2011-03-10 | 3 | -62/+92 |
|/ / |
|
* | | Move all Widevine code which have dependency on vendor modules to vendor/wide... | Gloria Wang | 2011-02-18 | 8 | -1204/+0 |
* | | - Update from Widevine | Gloria Wang | 2011-02-18 | 8 | -0/+1204 |
* | | Bug 3361124 Remove drmioserver, continued | Glenn Kasten | 2011-01-21 | 2 | -132/+0 |
* | | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/ | Gloria Wang | 2011-01-18 | 1 | -1/+1 |
* | | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" | Gloria Wang | 2011-01-13 | 27 | -0/+5370 |
|\ \
| |/ |
|
| * | Merge "Initial OMA DRM forward lock contribution" | Gloria Wang | 2011-01-13 | 27 | -0/+5370 |
| |\ |
|
| | * | Initial OMA DRM forward lock contribution | Pravat Dalbehera | 2011-01-05 | 27 | -0/+5370 |
* | | | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." | Gloria Wang | 2011-01-11 | 2 | -1/+3 |
|\ \ \
| |/ / |
|
| * | | DRM Framework bug fixes. | Takeshi Aimi | 2010-11-30 | 2 | -1/+3 |
| |/ |
|
* | | Remove empty Widevine make files | Gloria Wang | 2010-11-24 | 1 | -27/+0 |
* | | am 24a90c26: am d9334934: Merge "Update of DRM Framework." | Gloria Wang | 2010-11-22 | 10 | -0/+69 |
|\ \
| |/ |
|
| * | Update of DRM Framework. | Takeshi Aimi | 2010-11-19 | 10 | -0/+69 |
* | | 64-bit file size/offset support for DRM framework | Gloria Wang | 2010-11-19 | 10 | -36/+36 |
* | | resolved conflicts for merge of a8d7b747 to master | Gloria Wang | 2010-11-03 | 10 | -91/+108 |
|\ \
| |/ |
|
| * | Update of DRM framework | Takeshi Aimi | 2010-11-02 | 10 | -91/+108 |
* | | Add support for WV plugin | Gloria Wang | 2010-10-29 | 1 | -0/+27 |
|/ |
|
* | Update of DRM framework. | Takeshi Aimi | 2010-10-04 | 11 | -176/+253 |
* | Make DRM libraries optional | Jean-Baptiste Queru | 2010-09-10 | 2 | -2/+3 |
* | fix build | Jean-Baptiste Queru | 2010-09-09 | 1 | -2/+7 |
* | fix build | Jean-Baptiste Queru | 2010-09-09 | 1 | -2/+7 |
* | Initial contribution from Sony Corporation. | aimitakeshi | 2010-09-01 | 19 | -0/+3287 |