commit f58deac41e9777f877a0587687ed07b80bd4efb9
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 09 12:58:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 09 12:58:11 2021 +0000
tree 9a52eef314b41d7b0d90a02ae5b562f72fe8d77c
parent 73f3aa5b9086adb4f0cf1db68e9f3d9992f2b393
parent deb922788180cd0db17d340d14d0433ba463dd46

Merge "audio: Fix SourceMetadata spec in HAL V7 VTS" am: b755e019fd am: a5182d5684 am: 118895aa50 am: deb9227881

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ae26eb4769a9c4f7678662e001a61680249d95

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;