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

Commit 8af5545d 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 

am: 04d24cb6

Change-Id: Ib10de5ef338100e0eacba85278d69a9f2f5f27e7
parents ae9f2761 04d24cb6

media/ndk/NdkMediaExtractor.cpp

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

    jobject service = NULL;

    if (env == NULL) {

    if (env == NULL) {

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

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

        env->ExceptionClear();

        return AMEDIA_ERROR_UNSUPPORTED;

        return AMEDIA_ERROR_UNSUPPORTED;

    }

    }