commit 402b8a0ef5c4fa0f7a70020bf0d93ec4714edbf3
author Android Build Merger (Role) <android-build-merger@google.com> Tue Oct 10 23:20:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 23:20:56 2017 +0000
tree dc3773b00fd17786c9233402ca7fb71a6f8501d4
parent 1e79b0c156b631e6528ca4b60e159ce023cf310a
parent 4fbd2434d533a49524d6572e29b7a0336b1c45a5

Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev

* changes:
  MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8 am: 1d242fdfff am: c8ab764e51
  Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071 am: 4797f02aee am: d951771d27 am: bd9ffb2a77 am: da86840b7b

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 00b3c7b..34ecb22 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -488,6 +488,9 @@
             LOG_ALWAYS_FATAL("unknown state %s(%#x).", asString(state), state);
             break;
     }
+
+    Mutex::Autolock _l(mLock);
+
     status_t err = mOwner->freeNode(this);
 
     mDispatcher.clear();