diff options
| author | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-11-30 16:27:42 +0900 |
|---|---|---|
| committer | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-11-30 16:27:42 +0900 |
| commit | c618b5af98dec06d49374a61a5a94016f9fec2d3 (patch) | |
| tree | a33e45ff0d2cd56b47da6fced34e898950ca08b2 /drm/drmserver | |
| parent | c533edc9c70dd9434e2e496dc0d52f534472c7e0 (diff) | |
| download | frameworks_av-c618b5af98dec06d49374a61a5a94016f9fec2d3.zip frameworks_av-c618b5af98dec06d49374a61a5a94016f9fec2d3.tar.gz frameworks_av-c618b5af98dec06d49374a61a5a94016f9fec2d3.tar.bz2 | |
DRM Framework bug fixes.
- Make sure to clean-up obsolete listeners.
- Close cursor after using it.
- Add virtual destructor to the base class of OnInfoListener.
Changes are made by SEMC and Sony.
Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
Diffstat (limited to 'drm/drmserver')
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index 537791c..49df1c8 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -117,7 +117,11 @@ status_t DrmManager::unloadPlugIns() { status_t DrmManager::setDrmServiceListener( int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) { Mutex::Autolock _l(mLock); - mServiceListeners.add(uniqueId, drmServiceListener); + if (NULL != drmServiceListener.get()) { + mServiceListeners.add(uniqueId, drmServiceListener); + } else { + mServiceListeners.removeItem(uniqueId); + } return DRM_NO_ERROR; } |