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

Commit 8962e08c authored by Paul McLean's avatar Paul McLean Committed by Android (Google) Code Review
Browse files

Merge "Fix audio dropouts with multiple playback streams." into lmp-dev

parents 47f64f2e 5c477aa6

services/audiopolicy/AudioPolicyManager.cpp

+16 −1
Original line number Diff line number Diff line
@@ -271,7 +271,13 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device, 
                return INVALID_OPERATION;

            }



            ALOGV("setDeviceConnectionState() disconnecting device %x", device);

            ALOGV("setDeviceConnectionState() disconnecting output device %x", device);



            // Set Disconnect to HALs

            AudioParameter param = AudioParameter(address);

            param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);

            mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());



            // remove device from available output devices

            mAvailableOutputDevices.remove(devDesc);
@@ -368,8 +374,17 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device, 
                ALOGW("setDeviceConnectionState() device not connected: %d", device);

                return INVALID_OPERATION;

            }



            ALOGV("setDeviceConnectionState() disconnecting input device %x", device);



            // Set Disconnect to HALs

            AudioParameter param = AudioParameter(address);

            param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);

            mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());



            checkInputsForDevice(device, state, inputs, address);

            mAvailableInputDevices.remove(devDesc);



        } break;



        default: