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

Commit ddbc6657 authored by Eric Laurent's avatar Eric Laurent Committed by Jean-Michel Trivi
Browse files

audiopolicy: Update input device check in checkInputsForDevice 

- When an input device is disconnected, checkInputsForDevice clears
  dynamic fields of input profiles that are supporting the disconnected
  device. AUDIO_DEVICE_BIT_IN mask is missing while comparing with the
  supported input devices of a profile which is resulting in clearing
  wrong fields

- Fix is to include AUDIO_DEVICE_BIT_IN in this comparison

- also fix two other places where comparison with input device was not
masked with AUDIO_DEVICE_BIT_IN.

Bug: 18367045

Change-Id: Icc94b8353bc49567d8a6d6a75293c3b0dd42d83c
parent e0b7ddcd

services/audiopolicy/AudioPolicyManager.cpp

+6 −3
Original line number Diff line number Diff line
@@ -3563,7 +3563,8 @@ status_t AudioPolicyManager::checkInputsForDevice(audio_devices_t device, 
        // check if one opened input is not needed any more after disconnecting one device

        for (size_t input_index = 0; input_index < mInputs.size(); input_index++) {

            desc = mInputs.valueAt(input_index);

            if (!(desc->mProfile->mSupportedDevices.types() & mAvailableInputDevices.types())) {

            if (!(desc->mProfile->mSupportedDevices.types() & mAvailableInputDevices.types() &

                    ~AUDIO_DEVICE_BIT_IN)) {

                ALOGV("checkInputsForDevice(): disconnecting adding input %d",

                      mInputs.keyAt(input_index));

                inputs.add(mInputs.keyAt(input_index));
@@ -3578,7 +3579,7 @@ status_t AudioPolicyManager::checkInputsForDevice(audio_devices_t device, 
                 profile_index < mHwModules[module_index]->mInputProfiles.size();

                 profile_index++) {

                sp<IOProfile> profile = mHwModules[module_index]->mInputProfiles[profile_index];

                if (profile->mSupportedDevices.types() & device) {

                if (profile->mSupportedDevices.types() & device & ~AUDIO_DEVICE_BIT_IN) {

                    ALOGV("checkInputsForDevice(): clearing direct input profile %zu on module %zu",

                          profile_index, module_index);

                    if (profile->mSamplingRates[0] == 0) {
@@ -3795,7 +3796,9 @@ void AudioPolicyManager::checkA2dpSuspend() 
    }



    bool isScoConnected =

            (mAvailableInputDevices.types() & AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET) != 0;

            ((mAvailableInputDevices.types() & AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET &

                    ~AUDIO_DEVICE_BIT_IN) != 0) ||

            ((mAvailableOutputDevices.types() & AUDIO_DEVICE_OUT_ALL_SCO) != 0);

    // suspend A2DP output if:

    //      (NOT already suspended) &&

    //      ((SCO device is connected &&