Commit 03753ecd authored Aug 28, 2015 by Wei Jia Committed by Android Git Automerger Aug 28, 2015

am a3610be1: am 08723d86: am 5d76e54d: Merge "NuPlayer: do not create audio...

am a3610be1: am 08723d86: am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev

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

parents ad4f583e a3610be1

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1488,7 +1488,9 @@ void NuPlayer::determineAudioModeChange() {
		}

		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;
		}