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

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() {