summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
...
* | | Deprecated a mis-spelled method and replaced it with a new methodJames Dong2012-02-271-0/+11
|/ /
* | Merge "Improved comment about DrmStore.ConstraintsColumns"James Dong2012-02-242-6/+27
|\ \
| * | Improved comment about DrmStore.ConstraintsColumnsJames Dong2012-02-232-6/+27
* | | Only allow valid types to be used in DrmErrorEvent and DrmInfoEventJames Dong2012-02-243-8/+66
|/ /
* | Added checks for illegal argumentsJames Dong2012-02-154-4/+40
* | Separate sniffing from session initializationJames Dong2012-01-1212-41/+141
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-083-14/+14
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-141-3/+2
|\ \ | |/
| * Revert the following patches because they may lead to power regression becaus...James Dong2011-12-141-3/+2
* | am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ | |/
| * Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
* | Fix log messageGlenn Kasten2011-11-101-1/+4
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-266-138/+138
|/
* 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
generated by cgit v1.1 at 2024-05-04 21:19:24 +0000