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

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

Merge "Always notify resource error in async mode when reclaim happens"

parents 9a94acde c66319fa

media/libstagefright/MediaCodec.cpp

+7 −5
Original line number Diff line number Diff line
@@ -2926,7 +2926,13 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            int32_t reclaimed = 0;

            msg->findInt32("reclaimed", &reclaimed);

            if (reclaimed) {

                if (!mReleasedByResourceManager) {

                    // notify the async client

                    if (mFlags & kFlagIsAsync) {

                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);

                    }

                    mReleasedByResourceManager = true;

                }



                int32_t force = 0;

                msg->findInt32("force", &force);
@@ -2938,10 +2944,6 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                    response->setInt32("err", WOULD_BLOCK);

                    response->postReply(replyID);



                    // notify the async client

                    if (mFlags & kFlagIsAsync) {

                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);

                    }

                    break;

                }

            }