| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change c... | Bill Gruber | 2011-03-23 | 14 | -466/+589 |
|\ \
| |/ |
|
| * | Merge "DRM API doc scrub This change contains information contributed by Sony... | Bill Gruber | 2011-03-23 | 14 | -466/+589 |
| |\ |
|
| | * | DRM API doc scrub | Bill Gruber | 2011-03-23 | 14 | -466/+589 |
* | | | Merge "Include strings.h for the strcasecmp prototype." | Carl Shapiro | 2011-03-22 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Include strings.h for the strcasecmp prototype. | Carl Shapiro | 2011-03-22 | 1 | -1/+1 |
* | | | | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHa... | Gloria Wang | 2011-03-22 | 1 | -2/+17 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Add one more field in DecryptHandle to support bug 4126624 | Gloria Wang | 2011-03-21 | 1 | -2/+17 |
| * | | do not merge: Cherry pick change I6529695c from master to partially fix bug 4... | Gloria Wang | 2011-03-21 | 1 | -188/+88 |
| |/ |
|
* | | Fix for 4084554. | Gloria Wang | 2011-03-21 | 1 | -188/+88 |
* | | Fix for bug 4126103. | Gloria Wang | 2011-03-17 | 1 | -2/+2 |
* | | am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more... | Gloria Wang | 2011-03-17 | 4 | -9/+81 |
|\ \
| |/ |
|
| * | Fix for 4089881. | Gloria Wang | 2011-03-16 | 4 | -9/+81 |
* | | Merge "Bug fixes of DRM framework." | Gloria Wang | 2011-03-15 | 7 | -20/+37 |
|\ \ |
|
| * | | Bug fixes of DRM framework. | Gloria Wang | 2011-03-15 | 7 | -20/+37 |
* | | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into... | Glenn Kasten | 2011-03-15 | 5 | -162/+6 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 | Glenn Kasten | 2011-03-15 | 5 | -162/+6 |
| |\ \ |
|
| | * | | Bug 4016329 do full string comparisons | Glenn Kasten | 2011-03-14 | 5 | -162/+6 |
* | | | | Add memory leak tracking/debugging code to drm server | James Dong | 2011-03-14 | 3 | -0/+32 |
* | | | | am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error ev... | Gloria Wang | 2011-03-14 | 3 | -6/+18 |
|\ \ \ \
| |/ / / |
|
| * | | | For issue 4082089 | Gloria Wang | 2011-03-14 | 3 | -6/+18 |
| |/ / |
|
* | | | frameworks/base: remove LOCAL_PRELINK_MODULE | Iliyan Malchev | 2011-03-14 | 4 | -4/+4 |
* | | | resolved conflicts for merge of c761a80d to master | Gloria Wang | 2011-03-14 | 3 | -7/+3 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | - Some change on the DrmManager in order to support feature request 4082089. | Gloria Wang | 2011-03-11 | 3 | -7/+3 |
* | | Fix for bug 3477330 | Gloria Wang | 2011-03-10 | 4 | -67/+92 |
|/ |
|
* | Merge "- Change level of some LOGs from LOGE to LOGV because those logs are... | Gloria Wang | 2011-03-09 | 2 | -4/+31 |
|\ |
|
| * | - Change level of some LOGs from LOGE to LOGV because those logs | Gloria Wang | 2011-03-09 | 2 | -4/+31 |
* | | To support uri started with http:// in some Java APIs | Gloria Wang | 2011-03-07 | 1 | -0/+5 |
|/ |
|
* | Merge "Do not call processDrmInfo if acquireDrmInfo returns null" | Gloria Wang | 2011-03-02 | 1 | -0/+3 |
|\ |
|
| * | Do not call processDrmInfo if acquireDrmInfo returns null | Gloria Wang | 2011-03-02 | 1 | -0/+3 |
* | | To support DRM files without file extension | Gloria Wang | 2011-03-02 | 2 | -2/+5 |
|/ |
|
* | 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 | 4 | -207/+0 |
* | Bug 3361124 Remove drmioserver | Glenn Kasten | 2011-01-20 | 3 | -132/+0 |
* | am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb | Gloria Wang | 2011-01-19 | 1 | -2/+2 |
|\ |
|
| * | am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb | Gloria Wang | 2011-01-19 | 1 | -2/+2 |
| |\ |
|
| | * | More fix for 64 bit offset. | Gloria Wang | 2011-01-19 | 1 | -2/+2 |
* | | | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/ | Gloria Wang | 2011-01-18 | 1 | -1/+1 |
* | | | am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock co... | Gloria Wang | 2011-01-13 | 27 | -0/+5370 |
|\ \ \
| |/ / |
|
| * | | 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 |
* | | | | | Merge "Bug 3229711" | Glenn Kasten | 2011-01-12 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Bug 3229711 | Glenn Kasten | 2011-01-11 | 1 | -1/+1 |
| | |_|/
| |/| | |
|
* | | | | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." | Gloria Wang | 2011-01-11 | 4 | -21/+35 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | DRM Framework bug fixes. | Takeshi Aimi | 2010-11-30 | 4 | -21/+35 |
| |/ |
|
* | | Remove empty Widevine make files | Gloria Wang | 2010-11-24 | 1 | -27/+0 |