From 9ea65d0f4a564478343b1a722fae4ce5883670c3 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 17 Jan 2014 10:21:24 -0800 Subject: 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 --- include/media/AudioSystem.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/media/AudioSystem.h') 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 gAudioPolicyService; - // mapping between stream types and outputs - static DefaultKeyedVector gStreamOutputMap; // list of output descriptors containing cached parameters // (sampling rate, framecount, channel count...) static DefaultKeyedVector gOutputs; -- cgit v1.1