From 1467ec343309821b215cb3e049a6746d07030c07 Mon Sep 17 00:00:00 2001
From: Gloria Wang <gwang@google.com>
Date: Thu, 4 Aug 2011 16:01:35 -0700
Subject: [PATCH] Close the DRM session in the destructor of
 ChromiumHTTPDataSource. Fix for bug 5015079.

Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
---
 .../libstagefright/chromium_http/ChromiumHTTPDataSource.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
index 07a9eb892c5d7..887fe7c4e4e6c 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() {