commit b60bd1b586b74ddf375257c4d07323e271d84ff3
author Mikhail Naganov <mnaganov@google.com> Thu Jul 15 17:31:43 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Fri Jul 16 15:00:47 2021 -0700
tree ed6d2b7f8ec836b0de7aefab9ee044a9d273abc8
parent 8ce8149ff6f6560e1abe3e015c37cfdfcd75bc2b

Switch the framework AIDL to use AudioFormatDescription

'AudioFormatDescription' is a new type that will be used
both by HAL and framework interfaces. This CL changes the
framework interfaces to use it instead of 'AudioFormatSys' type
which was used to pass legacy 'audio_devices_t' transparently
via the AIDL layer.

Bug: 188932434
Test: check audio on device
Change-Id: I9680d4d674950838f0ef0c9b4e45feaa662c5309

services/audiopolicy/service/AudioPolicyService.h

diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index 93dbe99..e4adfe7 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -71,13 +71,13 @@
             const media::AudioDevice& device,
             media::AudioPolicyDeviceState state,
             const std::string& deviceName,
-            media::AudioFormatSys encodedFormat) override;
+            const media::AudioFormatDescription& encodedFormat) override;
     binder::Status getDeviceConnectionState(const media::AudioDevice& device,
                                             media::AudioPolicyDeviceState* _aidl_return) override;
     binder::Status handleDeviceConfigChange(
             const media::AudioDevice& device,
             const std::string& deviceName,
-            media::AudioFormatSys encodedFormat) override;
+            const media::AudioFormatDescription& encodedFormat) override;
     binder::Status setPhoneState(media::AudioMode state, int32_t uid) override;
     binder::Status setForceUse(media::AudioPolicyForceUse usage,
                                media::AudioPolicyForcedConfig config) override;
@@ -196,13 +196,13 @@
                                      const media::AudioDeviceDescription& device,
                                      float* _aidl_return) override;
     binder::Status getSurroundFormats(media::Int* count,
-                                      std::vector<media::AudioFormatSys>* formats,
+                                      std::vector<media::AudioFormatDescription>* formats,
                                       std::vector<bool>* formatsEnabled) override;
     binder::Status getReportedSurroundFormats(
-            media::Int* count, std::vector<media::AudioFormatSys>* formats) override;
+            media::Int* count, std::vector<media::AudioFormatDescription>* formats) override;
     binder::Status getHwOffloadEncodingFormatsSupportedForA2DP(
-            std::vector<media::AudioFormatSys>* _aidl_return) override;
-    binder::Status setSurroundFormatEnabled(media::AudioFormatSys audioFormat,
+            std::vector<media::AudioFormatDescription>* _aidl_return) override;
+    binder::Status setSurroundFormatEnabled(const media::AudioFormatDescription& audioFormat,
                                             bool enabled) override;
     binder::Status setAssistantUid(int32_t uid) override;
     binder::Status setA11yServicesUids(const std::vector<int32_t>& uids) override;