commit a5182d568443f3ce2ecedd56bb5addecac1a1e76
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 09 08:31:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 09 08:31:52 2021 +0000
tree a998335af9a3d7518ff36ecd89d2871eb21d8b15
parent 78d2245b33efd9af20bbe0f73369242289d7e5d2
parent b755e019fd072d8b401312b8e299446d2ddd4dfe

Merge "audio: Fix SourceMetadata spec in HAL V7 VTS" am: b755e019fd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1580885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff5217ec01041733592a2f72acfe013b90be8e37

audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp

diff --git a/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
index bb7c6d3..f87e5ed 100644
--- a/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
+++ b/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
@@ -322,9 +322,9 @@
                 const SourceMetadata metadata = {
                         {{toString(usage),
                           toString(content),
-                          {} /* tags */,
+                          volume,
                           toString(xsd::AudioChannelMask::AUDIO_CHANNEL_OUT_STEREO),
-                          volume}}};
+                          {} /* tags */}}};
                 ASSERT_RESULT(okOrNotSupported, stream->updateSourceMetadata(metadata))
                         << "usage=" << toString(usage) << ", content=" << toString(content)
                         << ", volume=" << volume;