summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-05-06 16:06:24 -0700
committerGlenn Kasten <gkasten@google.com>2013-05-06 16:27:25 -0700
commit831a0055665c3d15ff9c99ad23e5ab2b7346f2ac (patch)
tree8771dff60a0c7b6520c820366dfa597810ff1ad4 /services/audioflinger/AudioFlinger.h
parent1a95a7275f8263a4ee7775af57543f80c4d700a0 (diff)
downloadframeworks_av-831a0055665c3d15ff9c99ad23e5ab2b7346f2ac.zip
frameworks_av-831a0055665c3d15ff9c99ad23e5ab2b7346f2ac.tar.gz
frameworks_av-831a0055665c3d15ff9c99ad23e5ab2b7346f2ac.tar.bz2
Fix Audioflinger crash when TeeSink is enabled
Bug: 8834855 Change-Id: I54665f16d79901970348a8247d9a354da2990f42
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index d0ef922..b0efef6 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -588,11 +588,12 @@ private:
status_t closeOutput_nonvirtual(audio_io_handle_t output);
status_t closeInput_nonvirtual(audio_io_handle_t input);
-#ifdef TEE_SINK
+// do not use #ifdef here, since AudioFlinger.h is included by more than one module
+//#ifdef TEE_SINK
// all record threads serially share a common tee sink, which is re-created on format change
sp<NBAIO_Sink> mRecordTeeSink;
sp<NBAIO_Source> mRecordTeeSource;
-#endif
+//#endif
public: