diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-25 10:11:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:11:49 -0700 |
| commit | 503b111b2421673796500627a1f6d74d81bf9548 (patch) | |
| tree | a802eff6d9b3d6403d1d87f63be04fb93fef581c /drm/libdrmframework | |
| parent | 1e0efd157b0b182ea7ba84cc21e89bb23f5d6ddf (diff) | |
| parent | ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3 (diff) | |
| download | frameworks_base-503b111b2421673796500627a1f6d74d81bf9548.zip frameworks_base-503b111b2421673796500627a1f6d74d81bf9548.tar.gz frameworks_base-503b111b2421673796500627a1f6d74d81bf9548.tar.bz2 | |
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Diffstat (limited to 'drm/libdrmframework')
| -rw-r--r-- | drm/libdrmframework/DrmManagerClient.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drm/libdrmframework/DrmManagerClient.cpp b/drm/libdrmframework/DrmManagerClient.cpp index 8b78132..b50199f 100644 --- a/drm/libdrmframework/DrmManagerClient.cpp +++ b/drm/libdrmframework/DrmManagerClient.cpp @@ -32,7 +32,6 @@ DrmManagerClient::~DrmManagerClient() { DrmManagerClientImpl::remove(mUniqueId); mDrmManagerClientImpl->removeClient(mUniqueId); mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL); - delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL; } status_t DrmManagerClient::setOnInfoListener( |