commit 566da808857c2c26e191ce18aba5abe97746fe1a
author Wei Jia <wjia@google.com> Thu Aug 27 13:59:30 2015 -0700
committer Wei Jia <wjia@google.com> Thu Aug 27 13:59:30 2015 -0700
tree f94fb86a338646b710b9a86f76acca0e7a270361
parent 3a124eb05e7ef3056ebc1abc7390e8371dd52112

NuPlayer: do not create audio decoder if the player is still in shutdown process.

Bug: 23350795
Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 77b9799..c0146d5 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1488,7 +1488,9 @@
 }
 
 status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {
-    if (*decoder != NULL) {
+    // The audio decoder could be cleared by tear down. If still in shut down
+    // process, no need to create a new audio decoder.
+    if (*decoder != NULL || (audio && mFlushingAudio == SHUT_DOWN)) {
         return OK;
     }