commit cb155c8f4bf556b0d37c3596c4dc265ab491152b
author Glenn Kasten <gkasten@google.com> Mon Jul 22 14:43:59 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 22 14:43:59 2013 +0000
tree 5b9f53d2c33435c511b010801de6233106497783
parent 18cf609ca3f20a9da2c7e140088d7557e7479f49
parent 0d61251648b5110bfc33ef5b3d19bbf65db0a7b5

Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index b640b31..2df9173 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -594,12 +594,11 @@
     status_t    closeOutput_nonvirtual(audio_io_handle_t output);
     status_t    closeInput_nonvirtual(audio_io_handle_t input);
 
-// do not use #ifdef here, since AudioFlinger.h is included by more than one module
-//#ifdef TEE_SINK
+#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: