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/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 4bbd4f7..49c4bc0 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -1634,59 +1634,6 @@
return aps->getDevicesForRoleAndStrategy(strategy, role, devices);
}
-status_t AudioSystem::setDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role,
- const AudioDeviceTypeAddrVector &devices)
-{
- const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) {
- return PERMISSION_DENIED;
- }
- return aps->setDevicesRoleForCapturePreset(audioSource, role, devices);
-}
-
-status_t AudioSystem::addDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role,
- const AudioDeviceTypeAddrVector &devices)
-{
- const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) {
- return PERMISSION_DENIED;
- }
- return aps->addDevicesRoleForCapturePreset(audioSource, role, devices);
-}
-
-status_t AudioSystem::removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role, const AudioDeviceTypeAddrVector& devices)
-{
- const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) {
- return PERMISSION_DENIED;
- }
- return aps->removeDevicesRoleForCapturePreset(audioSource, role, devices);
-}
-
-status_t AudioSystem::clearDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role)
-{
- const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) {
- return PERMISSION_DENIED;
- }
- return aps->clearDevicesRoleForCapturePreset(audioSource, role);
-}
-
-status_t AudioSystem::getDevicesForRoleAndCapturePreset(audio_source_t audioSource,
- device_role_t role,
- AudioDeviceTypeAddrVector &devices)
-{
- const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
- if (aps == 0) {
- return PERMISSION_DENIED;
- }
- return aps->getDevicesForRoleAndCapturePreset(audioSource, role, devices);
-}
-
class CaptureStateListenerImpl : public media::BnCaptureStateListener,
public IBinder::DeathRecipient {
public:
diff --git a/media/libaudioclient/IAudioPolicyService.cpp b/media/libaudioclient/IAudioPolicyService.cpp
index 9d3212b..1491afe 100644
--- a/media/libaudioclient/IAudioPolicyService.cpp
+++ b/media/libaudioclient/IAudioPolicyService.cpp
@@ -119,11 +119,6 @@
AUDIO_MODULES_UPDATED, // oneway
SET_CURRENT_IME_UID,
REGISTER_SOUNDTRIGGER_CAPTURE_STATE_LISTENER,
- SET_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- ADD_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- REMOVE_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- CLEAR_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- GET_DEVICES_FOR_ROLE_AND_CAPTURE_PRESET,
};
#define MAX_ITEMS_PER_LIST 1024
@@ -1413,95 +1408,6 @@
return static_cast<status_t>(reply.readInt32());
}
- virtual status_t setDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role, const AudioDeviceTypeAddrVector &devices) {
- Parcel data, reply;
- data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
- data.writeUint32(static_cast<uint32_t>(audioSource));
- data.writeUint32(static_cast<uint32_t>(role));
- status_t status = data.writeParcelableVector(devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = remote()->transact(SET_DEVICES_ROLE_FOR_CAPTURE_PRESET, data, &reply);
- if (status != NO_ERROR) {
- return status;
- }
- return static_cast<status_t>(reply.readInt32());
- }
-
- virtual status_t addDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role, const AudioDeviceTypeAddrVector &devices)
- {
- Parcel data, reply;
- data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
- data.writeUint32(static_cast<uint32_t>(audioSource));
- data.writeUint32(static_cast<uint32_t>(role));
- status_t status = data.writeParcelableVector(devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = remote()->transact(ADD_DEVICES_ROLE_FOR_CAPTURE_PRESET, data, &reply);
- if (status != NO_ERROR) {
- return status;
- }
- return static_cast<status_t>(reply.readInt32());
- }
-
- virtual status_t removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role,
- const AudioDeviceTypeAddrVector& devices)
- {
- Parcel data, reply;
- data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
- data.writeUint32(static_cast<uint32_t>(audioSource));
- data.writeUint32(static_cast<uint32_t>(role));
- status_t status = data.writeParcelableVector(devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = remote()->transact(REMOVE_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- data, &reply);
- if (status != NO_ERROR) {
- return status;
- }
- return static_cast<status_t>(reply.readInt32());
- }
-
- virtual status_t clearDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role)
- {
- Parcel data, reply;
- data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
- data.writeUint32(static_cast<uint32_t>(audioSource));
- data.writeUint32(static_cast<uint32_t>(role));
- status_t status = remote()->transact(CLEAR_DEVICES_ROLE_FOR_CAPTURE_PRESET,
- data, &reply);
- if (status != NO_ERROR) {
- return status;
- }
- return static_cast<status_t>(reply.readInt32());
- }
-
- virtual status_t getDevicesForRoleAndCapturePreset(audio_source_t audioSource,
- device_role_t role, AudioDeviceTypeAddrVector &devices)
- {
- Parcel data, reply;
- data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
- data.writeUint32(static_cast<uint32_t>(audioSource));
- data.writeUint32(static_cast<uint32_t>(role));
- status_t status = remote()->transact(GET_DEVICES_FOR_ROLE_AND_CAPTURE_PRESET,
- data, &reply);
- if (status != NO_ERROR) {
- return status;
- }
- status = reply.readParcelableVector(&devices);
- if (status != NO_ERROR) {
- return status;
- }
- return static_cast<status_t>(reply.readInt32());
- }
-
virtual status_t getDevicesForAttributes(const AudioAttributes &aa,
AudioDeviceTypeAddrVector *devices) const
{
@@ -1638,12 +1544,7 @@
case SET_ALLOWED_CAPTURE_POLICY:
case AUDIO_MODULES_UPDATED:
case SET_CURRENT_IME_UID:
- case REGISTER_SOUNDTRIGGER_CAPTURE_STATE_LISTENER:
- case SET_DEVICES_ROLE_FOR_CAPTURE_PRESET:
- case ADD_DEVICES_ROLE_FOR_CAPTURE_PRESET:
- case REMOVE_DEVICES_ROLE_FOR_CAPTURE_PRESET:
- case CLEAR_DEVICES_ROLE_FOR_CAPTURE_PRESET:
- case GET_DEVICES_FOR_ROLE_AND_CAPTURE_PRESET: {
+ case REGISTER_SOUNDTRIGGER_CAPTURE_STATE_LISTENER: {
if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {
ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",
__func__, code, IPCThreadState::self()->getCallingPid(),
@@ -2828,71 +2729,6 @@
return NO_ERROR;
} break;
- case SET_DEVICES_ROLE_FOR_CAPTURE_PRESET: {
- CHECK_INTERFACE(IAudioPolicyService, data, reply);
- audio_source_t audioSource = (audio_source_t) data.readUint32();
- device_role_t role = (device_role_t) data.readUint32();
- AudioDeviceTypeAddrVector devices;
- status_t status = data.readParcelableVector(&devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = setDevicesRoleForCapturePreset(audioSource, role, devices);
- reply->writeInt32(status);
- return NO_ERROR;
- }
-
- case ADD_DEVICES_ROLE_FOR_CAPTURE_PRESET: {
- CHECK_INTERFACE(IAudioPolicyService, data, reply);
- audio_source_t audioSource = (audio_source_t) data.readUint32();
- device_role_t role = (device_role_t) data.readUint32();
- AudioDeviceTypeAddrVector devices;
- status_t status = data.readParcelableVector(&devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = addDevicesRoleForCapturePreset(audioSource, role, devices);
- reply->writeInt32(status);
- return NO_ERROR;
- }
-
- case REMOVE_DEVICES_ROLE_FOR_CAPTURE_PRESET: {
- CHECK_INTERFACE(IAudioPolicyService, data, reply);
- audio_source_t audioSource = (audio_source_t) data.readUint32();
- device_role_t role = (device_role_t) data.readUint32();
- AudioDeviceTypeAddrVector devices;
- status_t status = data.readParcelableVector(&devices);
- if (status != NO_ERROR) {
- return status;
- }
- status = removeDevicesRoleForCapturePreset(audioSource, role, devices);
- reply->writeInt32(status);
- return NO_ERROR;
- }
-
- case CLEAR_DEVICES_ROLE_FOR_CAPTURE_PRESET: {
- CHECK_INTERFACE(IAudioPolicyService, data, reply);
- audio_source_t audioSource = (audio_source_t) data.readUint32();
- device_role_t role = (device_role_t) data.readUint32();
- status_t status = clearDevicesRoleForCapturePreset(audioSource, role);
- reply->writeInt32(status);
- return NO_ERROR;
- }
-
- case GET_DEVICES_FOR_ROLE_AND_CAPTURE_PRESET: {
- CHECK_INTERFACE(IAudioPolicyService, data, reply);
- audio_source_t audioSource = (audio_source_t) data.readUint32();
- device_role_t role = (device_role_t) data.readUint32();
- AudioDeviceTypeAddrVector devices;
- status_t status = getDevicesForRoleAndCapturePreset(audioSource, role, devices);
- status_t marshall_status = reply->writeParcelableVector(devices);
- if (marshall_status != NO_ERROR) {
- return marshall_status;
- }
- reply->writeInt32(status);
- return NO_ERROR;
- }
-
default:
return BBinder::onTransact(code, data, reply, flags);
}
diff --git a/media/libaudioclient/include/media/AudioSystem.h b/media/libaudioclient/include/media/AudioSystem.h
index 848743a..09025d1 100644
--- a/media/libaudioclient/include/media/AudioSystem.h
+++ b/media/libaudioclient/include/media/AudioSystem.h
@@ -433,22 +433,6 @@
static status_t getDevicesForRoleAndStrategy(product_strategy_t strategy,
device_role_t role, AudioDeviceTypeAddrVector &devices);
- static status_t setDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role, const AudioDeviceTypeAddrVector &devices);
-
- static status_t addDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role, const AudioDeviceTypeAddrVector &devices);
-
- static status_t removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role,
- const AudioDeviceTypeAddrVector& devices);
-
- static status_t clearDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role);
-
- static status_t getDevicesForRoleAndCapturePreset(audio_source_t audioSource,
- device_role_t role, AudioDeviceTypeAddrVector &devices);
-
static status_t getDeviceForStrategy(product_strategy_t strategy,
AudioDeviceTypeAddr &device);
diff --git a/media/libaudioclient/include/media/IAudioPolicyService.h b/media/libaudioclient/include/media/IAudioPolicyService.h
index 2d5f687..afb0fda 100644
--- a/media/libaudioclient/include/media/IAudioPolicyService.h
+++ b/media/libaudioclient/include/media/IAudioPolicyService.h
@@ -252,25 +252,6 @@
device_role_t role,
AudioDeviceTypeAddrVector &devices) = 0;
- virtual status_t setDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role,
- const AudioDeviceTypeAddrVector &devices) = 0;
-
- virtual status_t addDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role,
- const AudioDeviceTypeAddrVector &devices) = 0;
-
- virtual status_t removeDevicesRoleForCapturePreset(
- audio_source_t audioSource, device_role_t role,
- const AudioDeviceTypeAddrVector& devices) = 0;
-
- virtual status_t clearDevicesRoleForCapturePreset(audio_source_t audioSource,
- device_role_t role) = 0;
-
- virtual status_t getDevicesForRoleAndCapturePreset(audio_source_t audioSource,
- device_role_t role,
- AudioDeviceTypeAddrVector &devices) = 0;
-
// The return code here is only intended to represent transport errors. The
// actual server implementation should always return NO_ERROR.
virtual status_t registerSoundTriggerCaptureStateListener(