commit ceb8bf98b9424ccdc09b1f91cec03f8127f97a28
author Mikhail Naganov <mnaganov@google.com> Thu Sep 23 21:29:39 2021 +0000
committer Mikhail Naganov <mnaganov@google.com> Fri Oct 01 18:11:56 2021 +0000
tree a0584a4beaf7909ffc9092a45eeeec163592b166
parent a4a926ff92fde2d2ce960695014b11f12db94355

Refactor AudioPort and AudioPortConfig

The goals are to split framework-only fields from common,
and to simplify and unify structures where possible.

What has got changed:

1. Removed 'AudioPort[Config]SessionExt' parcelables.
   These parcelables correspond to 'audio_port[_config]_session_ext',
   which is trivial--contains only 'session' field, and hasn't been
   extented since the inception. Remove AIDL types since each
   type requires its own file, which adds mental burden.

2. Removed 'AudioPort[Config]DeviceExt' parcelables.
   At the HAL level only the 'AudioDevice' field is needed.
   Moved remaining framework-only fields to 'AudioPortDeviceExtSys'
   which is reused between 'AudioPort' and 'AudioPortConfig'.

3. Merged 'AudioPortConfigMixExt' with 'AudioPortMixExt'.
   Moved remaining framework-only fields to 'AudioPortMixExtSys'.

4. The previous item allowed using 'AudioPortExt' instead of
   'AudioPortConfigExt'.

5. 'AudioPortDeviceExtSys' and 'AudioPortMixExtSys' put into
   'AudioPortExtSys' which is a system-only companion to 'AudioPortExt'.

Bug: 198812639
Test: atest audiofoundation_parcelable_test
Change-Id: I27306f7ce33b136860db6a9784d34960816987cd

media/libaudioclient/Android.bp

diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 3ba1fc2..3c8796e 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -324,16 +324,13 @@
         "aidl/android/media/AudioPlaybackRate.aidl",
         "aidl/android/media/AudioPort.aidl",
         "aidl/android/media/AudioPortConfig.aidl",
-        "aidl/android/media/AudioPortConfigDeviceExt.aidl",
-        "aidl/android/media/AudioPortConfigExt.aidl",
-        "aidl/android/media/AudioPortConfigMixExt.aidl",
-        "aidl/android/media/AudioPortConfigMixExtUseCase.aidl",
-        "aidl/android/media/AudioPortConfigSessionExt.aidl",
-        "aidl/android/media/AudioPortDeviceExt.aidl",
+        "aidl/android/media/AudioPortDeviceExtSys.aidl",
         "aidl/android/media/AudioPortExt.aidl",
+        "aidl/android/media/AudioPortExtSys.aidl",
         "aidl/android/media/AudioPortMixExt.aidl",
+        "aidl/android/media/AudioPortMixExtSys.aidl",
+        "aidl/android/media/AudioPortMixExtUseCase.aidl",
         "aidl/android/media/AudioPortRole.aidl",
-        "aidl/android/media/AudioPortSessionExt.aidl",
         "aidl/android/media/AudioPortType.aidl",
         "aidl/android/media/AudioProfileSys.aidl",
         "aidl/android/media/AudioStandard.aidl",