Gloria Wang dc87971f72 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin ... * commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e': - Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.		2011-03-14 09:35:08 -07:00
cmds
include	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
libs	Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1	2011-03-10 18:06:32 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	SurfaceFlinger: Respect the PROTECTED gralloc bit.	2011-03-10 16:25:48 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00