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

Commit a8ee170f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "NdkWrapper: return NULL when cryptoInfo is NULL"

parents 04a6a019 89cefe5c

media/libmedia/NdkWrapper.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,11 @@ sp<AMediaCodecCryptoInfoWrapper> AMediaExtractorWrapper::getSampleCryptoInfo() { 
    if (mAMediaExtractor == NULL) {

        return NULL;

    }

    return new AMediaCodecCryptoInfoWrapper(AMediaExtractor_getSampleCryptoInfo(mAMediaExtractor));

    AMediaCodecCryptoInfo *cryptoInfo = AMediaExtractor_getSampleCryptoInfo(mAMediaExtractor);

    if (cryptoInfo == NULL) {

        return NULL;

    }

    return new AMediaCodecCryptoInfoWrapper(cryptoInfo);

}



AMediaDataSourceWrapper::AMediaDataSourceWrapper(const sp<DataSource> &dataSource)