Revert "Support device role for capture preset."
Revert "Support set/clear/get preferred device for capture preset."
Revert submission 12409575-devicesRoleForCapturePreset
Reason for revert: break CarAudioZonesHelperTest
Reverted Changes:
I92fdb2cbd:Support set/clear/get preferred device for capture...
I44e67d5b0:Add a helper function of checking if an audio sour...
Ib16ab2ec8:Support device role for capture preset.
I46bd8dfb5:Add tests for set/get/clearPreferredDeviceForCaptu...
Change-Id: I80f5267a01b48d01681a2d97cf3eb9de573ca6b5
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index cb3725e..04c5cba 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3115,7 +3115,7 @@
devices[i].mType, devices[i].getAddress(), String8(),
AUDIO_FORMAT_DEFAULT, false /*allowToCreate*/, true /*matchAddress*/);
if (devDesc == nullptr || (predicate != nullptr && !predicate(devices[i].mType))) {
- ALOGE("%s: device type %#x address %s not supported or not match predicate",
+ ALOGE("%s: device type %#x address %s not supported or not an output device",
context, devices[i].mType, devices[i].getAddress());
return false;
}
@@ -3223,72 +3223,6 @@
return mEngine->getDevicesForRoleAndStrategy(strategy, role, devices);
}
-status_t AudioPolicyManager::setDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector &devices) {
- ALOGV("%s() audioSource=%d role=%d %s", __func__, audioSource, role,
- dumpAudioDeviceTypeAddrVector(devices).c_str());
-
- if (!areAllDevicesSupported(devices, audio_is_input_device, __func__)) {
- return BAD_VALUE;
- }
- status_t status = mEngine->setDevicesRoleForCapturePreset(audioSource, role, devices);
- ALOGW_IF(status != NO_ERROR,
- "Engine could not set preferred devices %s for audio source %d role %d",
- dumpAudioDeviceTypeAddrVector(devices).c_str(), audioSource, role);
-
- return status;
-}
-
-status_t AudioPolicyManager::addDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector &devices) {
- ALOGV("%s() audioSource=%d role=%d %s", __func__, audioSource, role,
- dumpAudioDeviceTypeAddrVector(devices).c_str());
-
- if (!areAllDevicesSupported(devices, audio_is_input_device, __func__)) {
- return BAD_VALUE;
- }
- status_t status = mEngine->addDevicesRoleForCapturePreset(audioSource, role, devices);
- ALOGW_IF(status != NO_ERROR,
- "Engine could not add preferred devices %s for audio source %d role %d",
- dumpAudioDeviceTypeAddrVector(devices).c_str(), audioSource, role);
-
- return status;
-}
-
-status_t AudioPolicyManager::removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector& devices)
-{
- ALOGV("%s() audioSource=%d role=%d devices=%s", __func__, audioSource, role,
- dumpAudioDeviceTypeAddrVector(devices).c_str());
-
- if (!areAllDevicesSupported(devices, audio_is_input_device, __func__)) {
- return BAD_VALUE;
- }
-
- status_t status = mEngine->removeDevicesRoleForCapturePreset(
- audioSource, role, devices);
- ALOGW_IF(status != NO_ERROR,
- "Engine could not remove devices role (%d) for capture preset %d", role, audioSource);
-
- return status;
-}
-
-status_t AudioPolicyManager::clearDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role) {
- ALOGV("%s() audioSource=%d role=%d", __func__, audioSource, role);
-
- status_t status = mEngine->clearDevicesRoleForCapturePreset(audioSource, role);
- ALOGW_IF(status != NO_ERROR,
- "Engine could not clear devices role (%d) for capture preset %d", role, audioSource);
-
- return status;
-}
-
-status_t AudioPolicyManager::getDevicesForRoleAndCapturePreset(
- audio_source_t audioSource, device_role_t role, AudioDeviceTypeAddrVector &devices) {
- return mEngine->getDevicesForRoleAndCapturePreset(audioSource, role, devices);
-}
-
status_t AudioPolicyManager::setUserIdDeviceAffinities(int userId,
const AudioDeviceTypeAddrVector& devices) {
ALOGI("%s() userId=%d num devices %zu", __func__, userId, devices.size());