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

Commit df4a70cf authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 

* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
parents 504c5e3f 75ae0de8

media/libstagefright/AwesomePlayer.cpp

+1 −6
Original line number Diff line number Diff line
@@ -1734,12 +1734,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { 
    dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient);

    if (mDecryptHandle != NULL) {

        CHECK(mDrmManagerClient);

        if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) {

            if (DecryptApiType::WV_BASED == mDecryptHandle->decryptApiType) {

                LOGD("Setting mCachedSource to NULL for WVM\n");

                mCachedSource.clear();

            }

        } else {

        if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) {

            notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE);

        }

    }