diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-25 10:09:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:09:09 -0700 |
| commit | ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3 (patch) | |
| tree | 374619a864414fa4e5e2675829dfcc3a2660171d /drm | |
| parent | 9a159217f538c0e228699530dceb22872bb7ba7f (diff) | |
| parent | aac43ea193e0cbd440854f3425579f9ff04abac3 (diff) | |
| download | frameworks_base-ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3.zip frameworks_base-ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3.tar.gz frameworks_base-ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3.tar.bz2 | |
am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Diffstat (limited to 'drm')
| -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 1d1e258..c1f382a 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( |