diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 20:56:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 20:56:04 +0000 |
| commit | 73ec11738cd4399c55d4905665a14a7c4cd42cbf (patch) | |
| tree | 1105d7402857079f44e234ba1ab6ecfa8290a094 | |
| parent | 8c7b9fb41585fccb06573252823b929c82a40999 (diff) | |
| parent | 9ea65d0f4a564478343b1a722fae4ce5883670c3 (diff) | |
| download | frameworks_av-73ec11738cd4399c55d4905665a14a7c4cd42cbf.zip frameworks_av-73ec11738cd4399c55d4905665a14a7c4cd42cbf.tar.gz frameworks_av-73ec11738cd4399c55d4905665a14a7c4cd42cbf.tar.bz2 | |
Merge "Fix uses of KeyedVector"
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 20d2956..862f919 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -323,8 +323,6 @@ private: static sp<IAudioPolicyService> gAudioPolicyService; - // mapping between stream types and outputs - static DefaultKeyedVector<audio_stream_type_t, audio_io_handle_t> gStreamOutputMap; // list of output descriptors containing cached parameters // (sampling rate, framecount, channel count...) static DefaultKeyedVector<audio_io_handle_t, OutputDescriptor *> gOutputs; diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 195aadf..9325d6e 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -37,7 +37,7 @@ sp<AudioSystem::AudioFlingerClient> AudioSystem::gAudioFlingerClient; audio_error_callback AudioSystem::gAudioErrorCallback = NULL; // Cached values -DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(0); +DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(NULL); // Cached values for recording queries, all protected by gLock uint32_t AudioSystem::gPrevInSamplingRate; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index c558568..7aee74a 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -159,6 +159,7 @@ out: AudioFlinger::AudioFlinger() : BnAudioFlinger(), mPrimaryHardwareDev(NULL), + mAudioHwDevs(NULL), mHardwareStatus(AUDIO_HW_IDLE), mMasterVolume(1.0f), mMasterMute(false), |