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

Commit 3478dc80 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "Fix LOG_FATAL_IF parameter ordering in ~AImageReader()." am: 36263395 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1527809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idced145a859cb2a1482d598ac32dcb3c1020c29d
parents 531d9200 36263395

media/ndk/NdkImage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ AImage::close(int releaseFenceFd) { 
    if (mIsClosed) {

        return;

    }

    if (!mReader->mIsClosed) {

    if (mReader->mIsOpen) {

        mReader->releaseImageLocked(this, releaseFenceFd);

    }

    // Should have been set to nullptr in releaseImageLocked

media/ndk/NdkImageReader.cpp

+4 −4
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ AImageReader::AImageReader(int32_t width, 


AImageReader::~AImageReader() {

    Mutex::Autolock _l(mLock);

    LOG_FATAL_IF("AImageReader not closed before destruction", mIsClosed != true);

    LOG_FATAL_IF(mIsOpen, "AImageReader not closed before destruction");

}



media_status_t
@@ -348,16 +348,16 @@ AImageReader::init() { 
    }

    mHandler = new CallbackHandler(this);

    mCbLooper->registerHandler(mHandler);



    mIsOpen = true;

    return AMEDIA_OK;

}



void AImageReader::close() {

    Mutex::Autolock _l(mLock);

    if (mIsClosed) {

    if (!mIsOpen) {

        return;

    }

    mIsClosed = true;

    mIsOpen = false;

    AImageReader_ImageListener nullListener = {nullptr, nullptr};

    setImageListenerLocked(&nullListener);

media/ndk/NdkImageReaderPriv.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct AImageReader : public RefBase { 
    native_handle_t*           mWindowHandle = nullptr;



    List<AImage*>              mAcquiredImages;

    bool                       mIsClosed = false;

    bool                       mIsOpen = false;



    Mutex                      mLock;

};