diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-17 10:21:24 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-25 16:13:00 -0700 |
| commit | 9ea65d0f4a564478343b1a722fae4ce5883670c3 (patch) | |
| tree | 7e23f994d376d45183eac141e914ddbfd126cdf5 /include/media/AudioSystem.h | |
| parent | 1392eb3d1802e9f894f87d7a7387207d1b6faca1 (diff) | |
| download | frameworks_av-9ea65d0f4a564478343b1a722fae4ce5883670c3.zip frameworks_av-9ea65d0f4a564478343b1a722fae4ce5883670c3.tar.gz frameworks_av-9ea65d0f4a564478343b1a722fae4ce5883670c3.tar.bz2 | |
Fix uses of KeyedVector
Constructor for AudioFlinger::mAudioHwDevs was missing, and so
AudioFlinger::findSuitableHwDev_l() could return an undefined pointer
if a non-0 module wasn't found.
A KeyedVector of Plain Old Data (POD) element type must specify the
default value in the constructor, or else the default will be undefined.
Minor:
- Parameter had wrong type in constructor for AudioSystem::gOutputs.
- Remove obsolete AudioSystem::gStreamOutputMap.
Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
Diffstat (limited to 'include/media/AudioSystem.h')
| -rw-r--r-- | include/media/AudioSystem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 28fdfd4..36cd33a 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -318,8 +318,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; |