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

Commit b235dee7 authored by Praveen Bharathi's avatar Praveen Bharathi Committed by Eric Laurent
Browse files

Added support for dock headset observer 



Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292
Signed-off-by: default avatarPraveen Bharathi <pbharathi@motorola.com>
parent 0821a824

include/media/AudioSystem.h

+7 −1
Original line number Diff line number Diff line
@@ -262,11 +262,15 @@ public: 
        DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = 0x100,

        DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = 0x200,

        DEVICE_OUT_AUX_DIGITAL = 0x400,

        DEVICE_OUT_ANLG_DOCK_HEADSET = 0x800,

        DEVICE_OUT_DGTL_DOCK_HEADSET = 0x1000,

        DEVICE_OUT_DEFAULT = 0x8000,

        DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE | DEVICE_OUT_SPEAKER | DEVICE_OUT_WIRED_HEADSET |

                DEVICE_OUT_WIRED_HEADPHONE | DEVICE_OUT_BLUETOOTH_SCO | DEVICE_OUT_BLUETOOTH_SCO_HEADSET |

                DEVICE_OUT_BLUETOOTH_SCO_CARKIT | DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_DEFAULT),

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL |

                DEVICE_OUT_ANLG_DOCK_HEADSET | DEVICE_OUT_DGTL_DOCK_HEADSET |

                DEVICE_OUT_DEFAULT),

        DEVICE_OUT_ALL_A2DP = (DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER),
@@ -309,6 +313,8 @@ public: 
        FORCE_WIRED_ACCESSORY,

        FORCE_BT_CAR_DOCK,

        FORCE_BT_DESK_DOCK,

        FORCE_ANALOG_DOCK,

        FORCE_DIGITAL_DOCK,

        NUM_FORCE_CONFIG,

        FORCE_DEFAULT = FORCE_NONE

    };

services/audioflinger/AudioPolicyManagerBase.cpp

+19 −3
Original line number Diff line number Diff line
@@ -356,7 +356,9 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst 
        break;

    case AudioSystem::FOR_MEDIA:

        if (config != AudioSystem::FORCE_HEADPHONES && config != AudioSystem::FORCE_BT_A2DP &&

            config != AudioSystem::FORCE_WIRED_ACCESSORY && config != AudioSystem::FORCE_NONE) {

            config != AudioSystem::FORCE_WIRED_ACCESSORY &&

            config != AudioSystem::FORCE_ANALOG_DOCK &&

            config != AudioSystem::FORCE_DIGITAL_DOCK && config != AudioSystem::FORCE_NONE) {

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

            return;

        }
@@ -372,7 +374,10 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst 
        break;

    case AudioSystem::FOR_DOCK:

        if (config != AudioSystem::FORCE_NONE && config != AudioSystem::FORCE_BT_CAR_DOCK &&

            config != AudioSystem::FORCE_BT_DESK_DOCK && config != AudioSystem::FORCE_WIRED_ACCESSORY) {

            config != AudioSystem::FORCE_BT_DESK_DOCK &&

            config != AudioSystem::FORCE_WIRED_ACCESSORY &&

            config != AudioSystem::FORCE_ANALOG_DOCK &&

            config != AudioSystem::FORCE_DIGITAL_DOCK) {

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

        }

        forceVolumeReeval = true;
@@ -1366,6 +1371,7 @@ status_t AudioPolicyManagerBase::handleA2dpDisconnection(AudioSystem::audio_devi 


void AudioPolicyManagerBase::closeA2dpOutputs()

{



    LOGV("setDeviceConnectionState() closing A2DP and duplicated output!");



    if (mDuplicatedOutput != 0) {
@@ -1558,6 +1564,8 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

            if (device) break;

            device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

            if (device) break;

#ifdef WITH_A2DP

            // when not in a phone call, phone strategy should route STREAM_VOICE_CALL to A2DP

            if (mPhoneState != AudioSystem::MODE_IN_CALL) {
@@ -1617,6 +1625,12 @@ uint32_t AudioPolicyManagerBase::getDeviceForStrategy(routing_strategy strategy, 
        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET;

        }

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET;

        }

        if (device2 == 0) {

            device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET;

        }

#ifdef WITH_A2DP

        if (mA2dpOutput != 0) {

            if (strategy == STRATEGY_SONIFICATION && !a2dpUsedForSonification()) {
@@ -1797,7 +1811,9 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 
        (AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP |

        AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

        AudioSystem::DEVICE_OUT_WIRED_HEADSET |

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) &&

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE |

        AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET |

        AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) &&

        (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) &&

        streamDesc.mCanBeMuted) {

        volume *= SONIFICATION_HEADSET_VOLUME_FACTOR;