diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-24 13:14:02 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-03-24 13:14:02 -0700 |
| commit | 4c87a75073987e30b36f6be781cd10f696876ba4 (patch) | |
| tree | 95c4dea897b44c84389c8ce531ea54949eadc4b8 | |
| parent | e2cd33531182b31e0ace2c3acb0e960fbf1ba273 (diff) | |
| download | frameworks_base-4c87a75073987e30b36f6be781cd10f696876ba4.zip frameworks_base-4c87a75073987e30b36f6be781cd10f696876ba4.tar.gz frameworks_base-4c87a75073987e30b36f6be781cd10f696876ba4.tar.bz2 | |
Fix for bug 4126624.
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
| -rw-r--r-- | drm/libdrmframework/DrmManagerClient.cpp | 1 | ||||
| -rw-r--r-- | include/drm/DrmManagerClient.h | 2 |
2 files changed, 1 insertions, 2 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( diff --git a/include/drm/DrmManagerClient.h b/include/drm/DrmManagerClient.h index 12142bc..7a0bf4f 100644 --- a/include/drm/DrmManagerClient.h +++ b/include/drm/DrmManagerClient.h @@ -365,7 +365,7 @@ public: private: int mUniqueId; - DrmManagerClientImpl* mDrmManagerClientImpl; + sp<DrmManagerClientImpl> mDrmManagerClientImpl; }; }; |