Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1

Browse Source 
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
This commit is contained in:
Gloria Wang
2011-03-25 10:09:09 -07:00
committed by Android Git Automerger
parent 9a159217f5 aac43ea193
commit ed7b688c01
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drm/libdrmframework/DrmManagerClient.cpp
View File

@@ -32,7 +32,6 @@ DrmManagerClient::~DrmManagerClient() {
DrmManagerClientImpl::remove(mUniqueId);
mDrmManagerClientImpl->removeClient(mUniqueId);
mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL);
delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL;
}
status_t DrmManagerClient::setOnInfoListener(

2
include/drm/DrmManagerClient.h
View File

@@ -365,7 +365,7 @@ public:
private:
int mUniqueId;
DrmManagerClientImpl* mDrmManagerClientImpl;
sp<DrmManagerClientImpl> mDrmManagerClientImpl;
};
};