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

Commit c84bc78d authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Audio policy: fix device gain initialization" into lmp-mr1-dev

parents 628d4ea1 1db89b9c

services/audiopolicy/AudioPolicyManager.cpp

+9 −3
Original line number Original line Diff line number Diff line
@@ -7449,9 +7449,6 @@ AudioPolicyManager::DeviceDescriptor::DeviceDescriptor(const String8& name, audi 
                             NULL),

                             NULL),

                     mDeviceType(type), mAddress(""), mId(0)

                     mDeviceType(type), mAddress(""), mId(0)

{

{

    if (mGains.size() > 0) {

        mGains[0]->getDefaultConfig(&mGain);

    }

}

}





bool AudioPolicyManager::DeviceDescriptor::equals(const sp<DeviceDescriptor>& other) const

bool AudioPolicyManager::DeviceDescriptor::equals(const sp<DeviceDescriptor>& other) const
@@ -7466,6 +7463,15 @@ bool AudioPolicyManager::DeviceDescriptor::equals(const sp<DeviceDescriptor>& ot 
                mChannelMask == other->mChannelMask);

                mChannelMask == other->mChannelMask);

}

}





void AudioPolicyManager::DeviceDescriptor::loadGains(cnode *root)

{

    AudioPort::loadGains(root);

    if (mGains.size() > 0) {

        mGains[0]->getDefaultConfig(&mGain);

    }

}





void AudioPolicyManager::DeviceVector::refreshTypes()

void AudioPolicyManager::DeviceVector::refreshTypes()

{

{

    mDeviceTypes = AUDIO_DEVICE_NONE;

    mDeviceTypes = AUDIO_DEVICE_NONE;

services/audiopolicy/AudioPolicyManager.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ protected: 




            audio_gain_mode_t loadGainMode(char *name);

            audio_gain_mode_t loadGainMode(char *name);

            void loadGain(cnode *root, int index);

            void loadGain(cnode *root, int index);

            void loadGains(cnode *root);

            virtual void loadGains(cnode *root);





            // searches for an exact match

            // searches for an exact match

            status_t checkExactSamplingRate(uint32_t samplingRate) const;

            status_t checkExactSamplingRate(uint32_t samplingRate) const;
@@ -344,10 +344,14 @@ protected: 
            virtual ~DeviceDescriptor() {}

            virtual ~DeviceDescriptor() {}





            bool equals(const sp<DeviceDescriptor>& other) const;

            bool equals(const sp<DeviceDescriptor>& other) const;



            // AudioPortConfig

            virtual sp<AudioPort> getAudioPort() const { return (AudioPort*) this; }

            virtual void toAudioPortConfig(struct audio_port_config *dstConfig,

            virtual void toAudioPortConfig(struct audio_port_config *dstConfig,

                                   const struct audio_port_config *srcConfig = NULL) const;

                                   const struct audio_port_config *srcConfig = NULL) const;

            virtual sp<AudioPort> getAudioPort() const { return (AudioPort*) this; }





            // AudioPort

            virtual void loadGains(cnode *root);

            virtual void toAudioPort(struct audio_port *port) const;

            virtual void toAudioPort(struct audio_port *port) const;





            status_t dump(int fd, int spaces, int index) const;

            status_t dump(int fd, int spaces, int index) const;