Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73ec1173 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix uses of KeyedVector"

parents 8c7b9fb4 9ea65d0f

include/media/AudioSystem.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

media/libmedia/AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/audioflinger/AudioFlinger.cpp

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ out: 
AudioFlinger::AudioFlinger()

    : BnAudioFlinger(),

      mPrimaryHardwareDev(NULL),

      mAudioHwDevs(NULL),

      mHardwareStatus(AUDIO_HW_IDLE),

      mMasterVolume(1.0f),

      mMasterMute(false),