Merge "audiopolicy: align custom APM with AOSP" into av-aosp-qc.lnx.10.0
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 2806284..dac096c 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -331,8 +331,6 @@
// handle input devices
if (audio_is_input_device(deviceType)) {
- SortedVector <audio_io_handle_t> inputs;
-
ssize_t index = mAvailableInputDevices.indexOf(device);
switch (state)
{
@@ -353,7 +351,7 @@
// 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 @@
// Set Disconnect to HALs
broadcastDeviceConnectionState(device, state);
- checkInputsForDevice(device, state, inputs);
+ checkInputsForDevice(device, state);
mAvailableInputDevices.remove(device);
} break;
@@ -395,7 +393,7 @@
// 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 @@
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 @@
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 @@
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,