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

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

Browse Source
This commit is contained in:
Gloria Wang
2011-03-25 10:01:37 -07:00
committed by Android (Google) Code Review
parent cc4b6a61c6 4c87a75073
commit b8b85ea296
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); DrmManagerClientImpl::remove(mUniqueId);
mDrmManagerClientImpl->removeClient(mUniqueId); mDrmManagerClientImpl->removeClient(mUniqueId);
mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL); mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL);
delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL;
} }
status_t DrmManagerClient::setOnInfoListener( status_t DrmManagerClient::setOnInfoListener(

2
include/drm/DrmManagerClient.h
View File

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