From b97ee930e4f7ed1587b869c92b4aa1dc90b641cc Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 8 May 2015 10:50:03 -0700 Subject: DO NOT MERGE - audio flinger: fix fuzz test crash Clear output stream pointer in duplicating thread when the main output to which it is attached is closed. Also do not forward master mute and volume commands to duplicating threads as this is not applicable. Also fix logic in AudioFlinger::primaryPlaybackThread_l() that could accidentally return a duplicating thread. This never happens because the primary thread is always first in the list. Bug: 20731946. Change-Id: Ic8869699836920351b23d09544c50a258d3fb585 (cherry picked from commit f6870aefc5e31d4220f3778c4e79ff34a61f48ad) --- services/audioflinger/Threads.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'services/audioflinger/Threads.h') diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index bb9aa18..ecb8e4e 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -229,6 +229,8 @@ public: // static externally-visible type_t type() const { return mType; } + bool isDuplicating() const { return (mType == DUPLICATING); } + audio_io_handle_t id() const { return mId;} // dynamic externally-visible -- cgit v1.1