diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-15 16:09:26 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-19 09:30:37 -0700 |
| commit | 0d61251648b5110bfc33ef5b3d19bbf65db0a7b5 (patch) | |
| tree | 0ae0e6c9cce87e880523a92218e549a4e5c81a63 /services | |
| parent | 153b9fe667e6e78e0218ff0159353097428c7657 (diff) | |
| download | frameworks_av-0d61251648b5110bfc33ef5b3d19bbf65db0a7b5.zip frameworks_av-0d61251648b5110bfc33ef5b3d19bbf65db0a7b5.tar.gz frameworks_av-0d61251648b5110bfc33ef5b3d19bbf65db0a7b5.tar.bz2 | |
Revert "Fix Audioflinger crash when TeeSink is enabled"
This reverts commit 84e391686d7eced293913d1d7993721224ee0ba1.
Bug: 8834855
Change-Id: I8211ef5ea5d87d97ada115723df31c8057f38ca8
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ private: 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: |