commit 803b192ea2651fbf2be740cf91f52ab511f24a6c
author Gloria Wang <gwang@google.com> Thu Aug 04 16:32:10 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 16:32:10 2011 -0700
tree 349bd3c0e3bde4b4f4bf8bfc669c76f32ec258c6
parent 163efc028544db685c8b6244deffcca28a91e3ba
parent 1467ec343309821b215cb3e049a6746d07030c07

Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."

media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp

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 @@
     delete mDelegate;
     mDelegate = NULL;
 
+    clearDRMState_l();
+
     if (mDrmManagerClient != NULL) {
         delete mDrmManagerClient;
         mDrmManagerClient = NULL;
@@ -116,8 +118,6 @@
     // mURI.clear();
 
     mIOResult = err;
-
-    clearDRMState_l();
 }
 
 void ChromiumHTTPDataSource::disconnect() {
@@ -251,8 +251,6 @@
     // mURI.clear();
 
     mCondition.broadcast();
-
-    clearDRMState_l();
 }
 
 sp<DecryptHandle> ChromiumHTTPDataSource::DrmInitialization() {