Remove AudioMixLatencyClass enum from AIDL interfaces
The enum was only used for the 'AudioPortMixExt.latencyClass'
field, which is "write only" on the framework side, and isn't
used on the HAL side.
Bug: 198812639
Test: m
Change-Id: Ibf245027696e4df1df6f434b9553012461f90b7b
diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index 45788e7..0803695 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -2559,30 +2559,6 @@
enumToMask_index<int32_t, AudioEncapsulationMetadataType>);
}
-ConversionResult<audio_mix_latency_class_t>
-aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(
- media::AudioMixLatencyClass aidl) {
- switch (aidl) {
- case media::AudioMixLatencyClass::LOW:
- return AUDIO_LATENCY_LOW;
- case media::AudioMixLatencyClass::NORMAL:
- return AUDIO_LATENCY_NORMAL;
- }
- return unexpected(BAD_VALUE);
-}
-
-ConversionResult<media::AudioMixLatencyClass>
-legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(
- audio_mix_latency_class_t legacy) {
- switch (legacy) {
- case AUDIO_LATENCY_LOW:
- return media::AudioMixLatencyClass::LOW;
- case AUDIO_LATENCY_NORMAL:
- return media::AudioMixLatencyClass::NORMAL;
- }
- return unexpected(BAD_VALUE);
-}
-
ConversionResult<audio_port_device_ext>
aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(const media::AudioPortDeviceExt& aidl) {
audio_port_device_ext legacy;
@@ -2611,11 +2587,9 @@
ConversionResult<audio_port_mix_ext>
aidl2legacy_AudioPortMixExt_audio_port_mix_ext(const media::AudioPortMixExt& aidl) {
- audio_port_mix_ext legacy;
+ audio_port_mix_ext legacy{};
legacy.hw_module = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_module_handle_t(aidl.hwModule));
legacy.handle = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_io_handle_t(aidl.handle));
- legacy.latency_class = VALUE_OR_RETURN(
- aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(aidl.latencyClass));
return legacy;
}
@@ -2624,8 +2598,6 @@
media::AudioPortMixExt aidl;
aidl.hwModule = VALUE_OR_RETURN(legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module));
aidl.handle = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(legacy.handle));
- aidl.latencyClass = VALUE_OR_RETURN(
- legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(legacy.latency_class));
return aidl;
}
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 04b1b93..3ba1fc2 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -319,7 +319,6 @@
"aidl/android/media/AudioIoConfigEvent.aidl",
"aidl/android/media/AudioIoDescriptor.aidl",
"aidl/android/media/AudioIoFlags.aidl",
- "aidl/android/media/AudioMixLatencyClass.aidl",
"aidl/android/media/AudioOutputFlags.aidl",
"aidl/android/media/AudioPatch.aidl",
"aidl/android/media/AudioPlaybackRate.aidl",
diff --git a/media/libaudioclient/aidl/android/media/AudioMixLatencyClass.aidl b/media/libaudioclient/aidl/android/media/AudioMixLatencyClass.aidl
deleted file mode 100644
index d70b364..0000000
--- a/media/libaudioclient/aidl/android/media/AudioMixLatencyClass.aidl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media;
-
-/**
- * {@hide}
- */
-@Backing(type="int")
-enum AudioMixLatencyClass {
- LOW = 0,
- NORMAL = 1,
-}
diff --git a/media/libaudioclient/aidl/android/media/AudioPortMixExt.aidl b/media/libaudioclient/aidl/android/media/AudioPortMixExt.aidl
index 62cdb8e..8362c4f 100644
--- a/media/libaudioclient/aidl/android/media/AudioPortMixExt.aidl
+++ b/media/libaudioclient/aidl/android/media/AudioPortMixExt.aidl
@@ -16,8 +16,6 @@
package android.media;
-import android.media.AudioMixLatencyClass;
-
/**
* {@hide}
*/
@@ -26,6 +24,4 @@
int hwModule;
/** I/O handle of the input/output stream. Interpreted as audio_io_handle_t. */
int handle;
- /** Latency class */
- AudioMixLatencyClass latencyClass;
}
diff --git a/media/libaudioclient/include/media/AidlConversion.h b/media/libaudioclient/include/media/AidlConversion.h
index 1095766..7b5013d 100644
--- a/media/libaudioclient/include/media/AidlConversion.h
+++ b/media/libaudioclient/include/media/AidlConversion.h
@@ -28,7 +28,6 @@
#include <android/media/AudioInputFlags.h>
#include <android/media/AudioIoConfigEvent.h>
#include <android/media/AudioIoDescriptor.h>
-#include <android/media/AudioMixLatencyClass.h>
#include <android/media/AudioOutputFlags.h>
#include <android/media/AudioPlaybackRate.h>
#include <android/media/AudioPort.h>
@@ -342,13 +341,6 @@
ConversionResult<int32_t>
legacy2aidl_AudioEncapsulationMetadataType_mask(uint32_t legacy);
-ConversionResult<audio_mix_latency_class_t>
-aidl2legacy_AudioMixLatencyClass_audio_mix_latency_class_t(
- media::AudioMixLatencyClass aidl);
-ConversionResult<media::AudioMixLatencyClass>
-legacy2aidl_audio_mix_latency_class_t_AudioMixLatencyClass(
- audio_mix_latency_class_t legacy);
-
ConversionResult<audio_port_device_ext>
aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(const media::AudioPortDeviceExt& aidl);
ConversionResult<media::AudioPortDeviceExt>
diff --git a/media/libaudioclient/include/media/PolicyAidlConversion.h b/media/libaudioclient/include/media/PolicyAidlConversion.h
index edecfef..2296fdb 100644
--- a/media/libaudioclient/include/media/PolicyAidlConversion.h
+++ b/media/libaudioclient/include/media/PolicyAidlConversion.h
@@ -23,7 +23,6 @@
#include <android/media/AudioMix.h>
#include <android/media/AudioMixCallbackFlag.h>
-#include <android/media/AudioMixLatencyClass.h>
#include <android/media/AudioMixRouteFlag.h>
#include <android/media/AudioMixType.h>
#include <android/media/AudioOffloadMode.h>