From 401dd54718f28128fa605e996b7503bbaef62146 Mon Sep 17 00:00:00 2001 From: Dhananjay Kumar Date: Tue, 7 May 2019 18:55:16 +0530 Subject: audiopolicy: align custom APM with AOSP - Update custom APM for 190501 tag Change-Id: I6f97f3f09dc3e6c7d848480b135499bc100caaa1 --- policy_hal/AudioPolicyManager.cpp | 10 +++++----- policy_hal/AudioPolicyManager.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index 99f1a24..698136b 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -331,8 +331,6 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d // handle input devices if (audio_is_input_device(deviceType)) { - SortedVector inputs; - ssize_t index = mAvailableInputDevices.indexOf(device); switch (state) { @@ -353,7 +351,7 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d // parameters on newly connected devices (instead of opening the inputs...) broadcastDeviceConnectionState(device, state); - if (checkInputsForDevice(device, state, inputs) != NO_ERROR) { + if (checkInputsForDevice(device, state) != NO_ERROR) { broadcastDeviceConnectionState(device, AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE); mHwModules.cleanUpForDevice(device); @@ -382,7 +380,7 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d // Set Disconnect to HALs broadcastDeviceConnectionState(device, state); - checkInputsForDevice(device, state, inputs); + checkInputsForDevice(device, state); mAvailableInputDevices.remove(device); } break; @@ -395,7 +393,7 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d // Propagate device availability to Engine setEngineDeviceConnectionState(device, state); - closeAllInputs(); + checkCloseInputs(); /*audio policy: fix call volume over USB*/ // As the input device list can impact the output device selection, update // getDeviceForStrategy() cache @@ -1869,6 +1867,7 @@ non_direct_output: status_t AudioPolicyManagerCustom::getInputForAttr(const audio_attributes_t *attr, audio_io_handle_t *input, + audio_unique_id_t riid, audio_session_t session, uid_t uid, const audio_config_base_t *config, @@ -1934,6 +1933,7 @@ status_t AudioPolicyManagerCustom::getInputForAttr(const audio_attributes_t *att return AudioPolicyManager::getInputForAttr(attr, input, + riid, session, uid, config, diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h index 5a8a907..61f9821 100644 --- a/policy_hal/AudioPolicyManager.h +++ b/policy_hal/AudioPolicyManager.h @@ -96,6 +96,7 @@ public: virtual status_t getInputForAttr(const audio_attributes_t *attr, audio_io_handle_t *input, + audio_unique_id_t riid, audio_session_t session, uid_t uid, const audio_config_base_t *config, -- cgit v1.2.3