diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-25 10:05:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-25 10:05:50 -0700 |
| commit | 504c5e3fa3d4378773bd76b045d7a2e1e834fe59 (patch) | |
| tree | 39a4805c9aec35a5b2518e6afa935db72255f375 /drm | |
| parent | e3f51330a41df2382cf9dfe7fd31598a1aed9a5e (diff) | |
| parent | 25cd5788a70f45c807ad22aa0ecdc7e1d4d5fd67 (diff) | |
| download | frameworks_av-504c5e3fa3d4378773bd76b045d7a2e1e834fe59.zip frameworks_av-504c5e3fa3d4378773bd76b045d7a2e1e834fe59.tar.gz frameworks_av-504c5e3fa3d4378773bd76b045d7a2e1e834fe59.tar.bz2 | |
am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
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( |