summaryrefslogtreecommitdiffstats
path: root/sax/java
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-14 09:35:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-14 09:35:08 -0700
commitc761a80df372a7f7e70ceeb2902089c53ff980f2 (patch)
tree9282d20168dc1363daa1e08a424e8e917373ffdc /sax/java
parent151c74b3c679a1799d01f210a2a3f4a658154320 (diff)
parent7ea3c7f5a31dcc40d3b5042e3eb724916b66384e (diff)
downloadframeworks_base-c761a80df372a7f7e70ceeb2902089c53ff980f2.zip
frameworks_base-c761a80df372a7f7e70ceeb2902089c53ff980f2.tar.gz
frameworks_base-c761a80df372a7f7e70ceeb2902089c53ff980f2.tar.bz2
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.
Diffstat (limited to 'sax/java')
0 files changed, 0 insertions, 0 deletions