summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-08-04 16:32:10 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-04 16:32:10 -0700
commit803b192ea2651fbf2be740cf91f52ab511f24a6c (patch)
tree349bd3c0e3bde4b4f4bf8bfc669c76f32ec258c6 /media
parent163efc028544db685c8b6244deffcca28a91e3ba (diff)
parent1467ec343309821b215cb3e049a6746d07030c07 (diff)
downloadframeworks_base-803b192ea2651fbf2be740cf91f52ab511f24a6c.zip
frameworks_base-803b192ea2651fbf2be740cf91f52ab511f24a6c.tar.gz
frameworks_base-803b192ea2651fbf2be740cf91f52ab511f24a6c.tar.bz2
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
index 07a9eb8..887fe7c 100644
--- a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
+++ b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
@@ -47,6 +47,8 @@ ChromiumHTTPDataSource::~ChromiumHTTPDataSource() {
delete mDelegate;
mDelegate = NULL;
+ clearDRMState_l();
+
if (mDrmManagerClient != NULL) {
delete mDrmManagerClient;
mDrmManagerClient = NULL;
@@ -116,8 +118,6 @@ void ChromiumHTTPDataSource::onConnectionFailed(status_t err) {
// mURI.clear();
mIOResult = err;
-
- clearDRMState_l();
}
void ChromiumHTTPDataSource::disconnect() {
@@ -251,8 +251,6 @@ void ChromiumHTTPDataSource::onDisconnectComplete() {
// mURI.clear();
mCondition.broadcast();
-
- clearDRMState_l();
}
sp<DecryptHandle> ChromiumHTTPDataSource::DrmInitialization() {