frameworks_av.git - frameworks/av

	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 ordering assumption of argument evaluation.	Gloria Wang	2011-08-01	1	-21/+45
* \| \|	Fix for bug 4371230.	Gloria Wang	2011-07-25	10	-40/+53
* \| \|	Remove the simulator target from all makefiles.	Jeff Brown	2011-07-11	3	-22/+6
* \| \|	- Add two sanity checks.	Gloria Wang	2011-06-22	3	-1/+5
* \| \|	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	2	-17/+15
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	-Fix some typo	Gloria Wang	2011-06-15	2	-17/+15
* \| \| \|	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
* \| \|	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
* \| \|	Merge "Bug fixes of DRM framework."	Gloria Wang	2011-03-15	6	-19/+36
\|\ \ \
\| * \| \|	Bug fixes of DRM framework.	Gloria Wang	2011-03-15	6	-19/+36
* \| \| \|	am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into...	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
* \| \| \|	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	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
\|/ /
* \|	- Change level of some LOGs from LOGE to LOGV because those logs	Gloria Wang	2011-03-09	2	-4/+31
* \|	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
* \|	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	3	-2/+8
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	DRM Framework bug fixes.	Takeshi Aimi	2010-11-30	3	-2/+8
\| \|/