diff options
| author | Gloria Wang <gwang@google.com> | 2011-01-07 15:34:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-07 15:34:08 -0800 |
| commit | 9cfc9eff42a0700029c39e89c38b52488845ad63 (patch) | |
| tree | e838338c56e10b5de2f718c9c9b7e7130ae902a5 /drm/drmserver | |
| parent | e28b1e565705ffb85b05c8e226e1ab5010cb3821 (diff) | |
| parent | c2322f7ac756e78de9491c17dc3c0dd14456c599 (diff) | |
| download | frameworks_av-9cfc9eff42a0700029c39e89c38b52488845ad63.zip frameworks_av-9cfc9eff42a0700029c39e89c38b52488845ad63.tar.gz frameworks_av-9cfc9eff42a0700029c39e89c38b52488845ad63.tar.bz2 | |
am 0544d059: Merge "DRM Framework bug fixes."
* commit '0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
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; } |