diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-05-07 10:18:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-07 10:18:40 -0700 |
| commit | 106fbe30bb586242fb41c9bd4202eb8141d9ba65 (patch) | |
| tree | 91b0c45ee5e08e98a5b6aa044da7cf711232172f | |
| parent | 81243ade35dc0e8e9db4ea1afcdec9f124cb40e5 (diff) | |
| parent | 7fd56aba56e5508ceb9e3f1f88e16f964555895c (diff) | |
| download | frameworks_av-106fbe30bb586242fb41c9bd4202eb8141d9ba65.zip frameworks_av-106fbe30bb586242fb41c9bd4202eb8141d9ba65.tar.gz frameworks_av-106fbe30bb586242fb41c9bd4202eb8141d9ba65.tar.bz2 | |
am 7fd56aba: am 831a0055: Fix Audioflinger crash when TeeSink is enabled
* commit '7fd56aba56e5508ceb9e3f1f88e16f964555895c':
Fix Audioflinger crash when TeeSink is enabled
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 5 |
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: |