commit 3584a1afb3f263a13d12cc2d8003101c74453ce3
author Andy Hung <hunga@google.com> Wed Nov 12 00:24:34 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 12 00:24:34 2014 +0000
tree 2ccdf19b8683431e427fba9c3a287061334d9d47
parent 9226e7c5eba914e6917bf59e1b26417aedf1436a
parent 8bc9b3afceb793406a3dee0099ca636b26c58aa5

am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev
automerge: 8bc9b3a

* commit '8bc9b3afceb793406a3dee0099ca636b26c58aa5':
  MediaCodec: Prevent stop() in the UNINITIALIZED state

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index d7ddc89..11069e4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1349,9 +1349,12 @@
             uint32_t replyID;
             CHECK(msg->senderAwaitsResponse(&replyID));
 
-            if (!(mFlags & kFlagIsComponentAllocated) && mState != INITIALIZED
+            if (!((mFlags & kFlagIsComponentAllocated) && targetState == UNINITIALIZED) // See 1
+                    && mState != INITIALIZED
                     && mState != CONFIGURED && !isExecuting()) {
-                // We may be in "UNINITIALIZED" state already and
+                // 1) Permit release to shut down the component if allocated.
+                //
+                // 2) We may be in "UNINITIALIZED" state already and
                 // also shutdown the encoder/decoder without the
                 // client being aware of this if media server died while
                 // we were being stopped. The client would assume that