Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 803b192e authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

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

parents 163efc02 1467ec34

media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp

+2 −4
Original line number Diff line number Diff line
@@ -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() {