diff options
| author | Gloria Wang <gwang@google.com> | 2011-01-07 11:10:49 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-01-07 11:10:49 -0800 |
| commit | c2322f7ac756e78de9491c17dc3c0dd14456c599 (patch) | |
| tree | 07e0dad46bb5d1a926db251d06ae812fc7beb204 /drm/libdrmframework | |
| parent | 7f7371ad2df83fe6a085089446575d0bcd24d59a (diff) | |
| parent | c618b5af98dec06d49374a61a5a94016f9fec2d3 (diff) | |
| download | frameworks_av-c2322f7ac756e78de9491c17dc3c0dd14456c599.zip frameworks_av-c2322f7ac756e78de9491c17dc3c0dd14456c599.tar.gz frameworks_av-c2322f7ac756e78de9491c17dc3c0dd14456c599.tar.bz2 | |
Merge "DRM Framework bug fixes."
Diffstat (limited to 'drm/libdrmframework')
| -rw-r--r-- | drm/libdrmframework/DrmManagerClient.cpp | 1 | ||||
| -rw-r--r-- | drm/libdrmframework/DrmManagerClientImpl.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drm/libdrmframework/DrmManagerClient.cpp b/drm/libdrmframework/DrmManagerClient.cpp index fa3d52a..8bb00c3 100644 --- a/drm/libdrmframework/DrmManagerClient.cpp +++ b/drm/libdrmframework/DrmManagerClient.cpp @@ -31,6 +31,7 @@ DrmManagerClient::DrmManagerClient(): DrmManagerClient::~DrmManagerClient() { DrmManagerClientImpl::remove(mUniqueId); mDrmManagerClientImpl->removeClient(mUniqueId); + mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL); delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL; } diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp index 32fa491..eea312b 100644 --- a/drm/libdrmframework/DrmManagerClientImpl.cpp +++ b/drm/libdrmframework/DrmManagerClientImpl.cpp @@ -81,7 +81,8 @@ status_t DrmManagerClientImpl::setOnInfoListener( int uniqueId, const sp<DrmManagerClient::OnInfoListener>& infoListener) { Mutex::Autolock _l(mLock); mOnInfoListener = infoListener; - return getDrmManagerService()->setDrmServiceListener(uniqueId, this); + return getDrmManagerService()->setDrmServiceListener(uniqueId, + (NULL != infoListener.get()) ? this : NULL); } status_t DrmManagerClientImpl::installDrmEngine(int uniqueId, const String8& drmEngineFile) { |