summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-25 10:11:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-25 10:11:49 -0700
commit277360f06bdfefe821d4ddde8876f8e2507887c3 (patch)
tree5c9eeb0a89d523d8c7f729541e2de382f7d38646
parent199b6924d11a48ca8383392e18ac0f2e58523f01 (diff)
parent504c5e3fa3d4378773bd76b045d7a2e1e834fe59 (diff)
downloadframeworks_av-277360f06bdfefe821d4ddde8876f8e2507887c3.zip
frameworks_av-277360f06bdfefe821d4ddde8876f8e2507887c3.tar.gz
frameworks_av-277360f06bdfefe821d4ddde8876f8e2507887c3.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.
-rw-r--r--drm/libdrmframework/DrmManagerClient.cpp1
-rw-r--r--include/drm/DrmManagerClient.h2
2 files changed, 1 insertions, 2 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(
diff --git a/include/drm/DrmManagerClient.h b/include/drm/DrmManagerClient.h
index 5011137..b8fe46d 100644
--- a/include/drm/DrmManagerClient.h
+++ b/include/drm/DrmManagerClient.h
@@ -368,7 +368,7 @@ public:
private:
int mUniqueId;
- DrmManagerClientImpl* mDrmManagerClientImpl;
+ sp<DrmManagerClientImpl> mDrmManagerClientImpl;
};
};