diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-14 09:32:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 09:32:58 -0700 |
| commit | 50e4bf4895cb303ba9a68de044b984d61851cef0 (patch) | |
| tree | aab456746a87080f3777cd2506e94fae18f43931 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f1547b9a4ef75b316d69e570b467a6885f63b2e (diff) | |
| parent | e195b4bc54d486da39328d9e1ad06a43bf9056fe (diff) | |
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 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." into honeycomb-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions