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

Commit 04d24cb6 authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "Fix warning: Called C++ object pointer is null" am: 5d26ace4 am: e27bc81a 

am: cffbc7d0

Change-Id: I080a44e509499dbe43048d67f489f3fd8ca0cdc1
parents df6a4623 cffbc7d0

media/ndk/NdkMediaExtractor.cpp

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ media_status_t AMediaExtractor_setDataSource(AMediaExtractor *mData, const char 
    jobject service = NULL;

    if (env == NULL) {

        ALOGE("setDataSource(path) must be called from Java thread");

        env->ExceptionClear();

        return AMEDIA_ERROR_UNSUPPORTED;

    }