diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-14 11:56:39 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-03-14 11:56:39 -0700 |
| commit | 09ba5cebb2cbfbc1f5705b22796ebdf895d91db4 (patch) | |
| tree | a5e84f720d5e51c7c3f5901261620b412a54d635 /drm/libdrmframework/include | |
| parent | 6f3a75e13b86a3f40fe34e3ebd17b118791a73a4 (diff) | |
| parent | c761a80df372a7f7e70ceeb2902089c53ff980f2 (diff) | |
| download | frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.zip frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.tar.gz frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.tar.bz2 | |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
Diffstat (limited to 'drm/libdrmframework/include')
| -rw-r--r-- | drm/libdrmframework/include/DrmManager.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/libdrmframework/include/DrmManager.h b/drm/libdrmframework/include/DrmManager.h index e05366d..c7276f9 100644 --- a/drm/libdrmframework/include/DrmManager.h +++ b/drm/libdrmframework/include/DrmManager.h @@ -147,6 +147,7 @@ private: int mDecryptSessionId; int mConvertId; Mutex mLock; + Mutex mListenerLock; Mutex mDecryptLock; Mutex mConvertLock; TPlugInManager<IDrmEngine> mPlugInManager; |