| Commit message (Expand) | Author | Age | Files | Lines |
* | Separate sniffing from session initialization | James Dong | 2012-01-12 | 12 | -41/+141 |
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-08 | 3 | -14/+14 |
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 1 | -2/+2 |
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 2 | -28/+28 |
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ... | James Dong | 2011-12-14 | 1 | -3/+2 |
|\ |
|
| * | Revert the following patches because they may lead to power regression becaus... | James Dong | 2011-12-14 | 1 | -3/+2 |
* | | am f14dc291: Merge from ics-mr1 | The Android Open Source Project | 2011-12-12 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | Fix drm enumeration order, resolves failure to play forward lock ringtones | Jeff Tinker | 2011-12-09 | 1 | -2/+3 |
* | | Fix log message | Glenn Kasten | 2011-11-10 | 1 | -1/+4 |
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE | Steve Block | 2011-10-26 | 6 | -138/+138 |
|/ |
|
* | Modified loadPlugIns to load from /vendor and /system; skip libraries that ar... | Edwin Wong | 2011-09-21 | 1 | -9/+15 |
* | 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 ordering assumption of argument evaluation. | Gloria Wang | 2011-08-01 | 1 | -21/+45 |
* | | | Fix for bug 4371230. | Gloria Wang | 2011-07-25 | 12 | -48/+62 |
* | | | Remove the simulator target from all makefiles. | Jeff Brown | 2011-07-11 | 4 | -29/+8 |
* | | | - Add two sanity checks. | Gloria Wang | 2011-06-22 | 4 | -22/+19 |
* | | | 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 | 4 | -31/+29 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | -Fix some typo | Gloria Wang | 2011-06-15 | 4 | -31/+29 |
* | | | | 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 |
* | | | Fix memory leak from retrieval of getSupportedDrmInfo. | James Dong | 2011-04-24 | 1 | -0/+2 |
* | | | 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 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|