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

Commit 84cf7d9e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix bug 2329540 

 Part 1 of the fix: when the user doesn't elect to use the car dock
 for music and media, the APM was not aware of the device being
 docked.
 This is fixed by dissociating the notification for the APM of
 the docking to the dock from the sink state change of the A2DP
 device.
 Also missing was forcing the volumes to be reevaluated whenever
 the device is docked or undocked, as volumes for docks may
 differ, even when the same output device is being used.

Change-Id: If5314e27821a71adbd6df6fdf887c45208241d96
parent b51357d7

libs/audioflinger/AudioPolicyManagerBase.cpp

+5 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst 
{

    LOGV("setForceUse() usage %d, config %d, mPhoneState %d", usage, config, mPhoneState);



    bool forceVolumeReeval = false;

    switch(usage) {

    case AudioSystem::FOR_COMMUNICATION:

        if (config != AudioSystem::FORCE_SPEAKER && config != AudioSystem::FORCE_BT_SCO &&
@@ -374,6 +375,7 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst 
            config != AudioSystem::FORCE_BT_DESK_DOCK && config != AudioSystem::FORCE_WIRED_ACCESSORY) {

            LOGW("setForceUse() invalid config %d for FOR_DOCK", config);

        }

        forceVolumeReeval = true;

        mForceUse[usage] = config;

        break;

    default:
@@ -388,6 +390,9 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst 
#endif

    updateDeviceForStrategy();

    setOutputDevice(mHardwareOutput, newDevice);

    if (forceVolumeReeval) {

        applyStreamVolumes(mHardwareOutput, newDevice);

    }

}



AudioSystem::forced_config AudioPolicyManagerBase::getForceUse(AudioSystem::force_use usage)