diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-22 14:43:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-22 14:43:59 +0000 |
| commit | cb155c8f4bf556b0d37c3596c4dc265ab491152b (patch) | |
| tree | 5b9f53d2c33435c511b010801de6233106497783 /services/audioflinger/AudioFlinger.h | |
| parent | 18cf609ca3f20a9da2c7e140088d7557e7479f49 (diff) | |
| parent | 0d61251648b5110bfc33ef5b3d19bbf65db0a7b5 (diff) | |
| download | frameworks_av-cb155c8f4bf556b0d37c3596c4dc265ab491152b.zip frameworks_av-cb155c8f4bf556b0d37c3596c4dc265ab491152b.tar.gz frameworks_av-cb155c8f4bf556b0d37c3596c4dc265ab491152b.tar.bz2 | |
Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -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: |