commit 84d711ca7d00aa04dd53db0ed7f0e81e400e35a5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 17 19:17:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 19:17:52 2020 +0000
tree a055fd6a2d8c718278af0c941ae2e58502f8afb8
parent 9a94acde1170478bd5bf6da23fbb11063307fd46
parent c66319fa024f75b0f7b46d08acc7cb5a2fddd50f

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

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5015787..b5b5774 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2926,7 +2926,13 @@
             int32_t reclaimed = 0;
             msg->findInt32("reclaimed", &reclaimed);
             if (reclaimed) {
-                mReleasedByResourceManager = true;
+                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 @@
                     response->setInt32("err", WOULD_BLOCK);
                     response->postReply(replyID);
 
-                    // notify the async client
-                    if (mFlags & kFlagIsAsync) {
-                        onError(DEAD_OBJECT, ACTION_CODE_FATAL);
-                    }
                     break;
                 }
             }