diff options
| author | Gloria Wang <gwang@google.com> | 2011-08-04 16:32:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-04 16:32:10 -0700 |
| commit | ea7c2fea6a031d37270cb5b22b432729626b266d (patch) | |
| tree | 924d241dd3cac604c674a1008a8323865039837f /media/libstagefright/chromium_http | |
| parent | 1bea7ea4d571123992c38b6a406b58db1e7b4c7e (diff) | |
| parent | 99930d45c40f2d79a7633d9dd9f8478d22307848 (diff) | |
| download | frameworks_av-ea7c2fea6a031d37270cb5b22b432729626b266d.zip frameworks_av-ea7c2fea6a031d37270cb5b22b432729626b266d.tar.gz frameworks_av-ea7c2fea6a031d37270cb5b22b432729626b266d.tar.bz2 | |
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."
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() { |