commit 6537defa5f37719396964ba5e0fac5d53cf8f6fd
author Kriti Dang <kritidang@google.com> Tue Mar 02 13:46:59 2021 +0100
committer Kriti Dang <kritidang@google.com> Thu Mar 04 12:03:15 2021 +0100
tree 3fe4c420b6416176c84ea637fa8690804e55c949
parent c74fd5f5f0477cf2b2304c44969e7028fdb19096

Split getSurroundSound method in 2 methods.

Split getSurroundSound in:
getSurroundSound for formats supported by source android device
getReportedSurroundSound for formats reported by any connected sound
device like soundbar etc.

Bug: 177990551
Test: atest AudioPolicyManagerTestForHdmi
Change-Id: Iac811315049f0598c930afd75f069f058080dad4

services/audiopolicy/service/AudioPolicyService.h

diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index a11b2cc..a52b212 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -182,9 +182,11 @@
     binder::Status getMasterMono(bool* _aidl_return) override;
     binder::Status getStreamVolumeDB(media::AudioStreamType stream, int32_t index, int32_t device,
                                      float* _aidl_return) override;
-    binder::Status getSurroundFormats(bool reported, media::Int* count,
+    binder::Status getSurroundFormats(media::Int* count,
                                       std::vector<media::audio::common::AudioFormat>* formats,
                                       std::vector<bool>* formatsEnabled) override;
+    binder::Status getReportedSurroundFormats(
+            media::Int* count, std::vector<media::audio::common::AudioFormat>* formats) override;
     binder::Status getHwOffloadEncodingFormatsSupportedForA2DP(
             std::vector<media::audio::common::AudioFormat>* _aidl_return) override;
     binder::Status setSurroundFormatEnabled(media::audio::common::AudioFormat audioFormat,