summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-17 10:21:24 -0800
committerGlenn Kasten <gkasten@google.com>2014-03-25 16:13:00 -0700
commit9ea65d0f4a564478343b1a722fae4ce5883670c3 (patch)
tree7e23f994d376d45183eac141e914ddbfd126cdf5 /services/audioflinger/AudioFlinger.cpp
parent1392eb3d1802e9f894f87d7a7387207d1b6faca1 (diff)
downloadframeworks_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 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 50179c5..c1ac77b 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),