diff options
| author | Gloria Wang <gwang@google.com> | 2011-08-04 16:01:35 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-08-04 16:01:35 -0700 |
| commit | 99930d45c40f2d79a7633d9dd9f8478d22307848 (patch) | |
| tree | 1ce252fe279f3b24cf39a519863a7e86ef891059 /media/libstagefright/chromium_http | |
| parent | 6801b4dbd00b485ecdcd31b517ed885a8fa21c63 (diff) | |
| download | frameworks_av-99930d45c40f2d79a7633d9dd9f8478d22307848.zip frameworks_av-99930d45c40f2d79a7633d9dd9f8478d22307848.tar.gz frameworks_av-99930d45c40f2d79a7633d9dd9f8478d22307848.tar.bz2 | |
Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug 5015079.
Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
Diffstat (limited to 'media/libstagefright/chromium_http')
| -rw-r--r-- | media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp | 6 |
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() { |