commit df9b420d1a43d4fa7d75e10f00a15e482c994cae
author Kevin Rocard <krocard@google.com> Thu May 10 19:56:08 2018 -0700
committer Kevin Rocard <krocard@google.com> Mon Jun 18 12:58:10 2018 -0700
tree c7367730f593d5904396f5ef2bb04010d97090ca
parent d308499867c5403eb68113c793727183f82a48cf

Align LibAudioHal V2 and V4 for factorisation

In order to merge the two version, they must first align as much
as possible.

Test: playback music, assistant
Change-Id: If517cc3f4646a224af3e9b3d42b68a75f1801b39
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/4.0/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/4.0/DeviceHalHidl.cpp b/media/libaudiohal/4.0/DeviceHalHidl.cpp
index 6facca9..c547994 100644
--- a/media/libaudiohal/4.0/DeviceHalHidl.cpp
+++ b/media/libaudiohal/4.0/DeviceHalHidl.cpp
@@ -287,13 +287,13 @@
     Result retval = Result::NOT_INITIALIZED;
     // TODO: correctly propagate the tracks sources and volume
     //       for now, only send the main source at 1dbfs
-    SinkMetadata metadata = {{{AudioSource(source), 1}}};
+    SinkMetadata sourceMetadata = {{{AudioSource(source), 1}}};
     Return<void> ret = mDevice->openInputStream(
             handle,
             hidlDevice,
             hidlConfig,
-            flags,
-            metadata,
+            mkEnumConverter<AudioInputFlag>(flags),
+            sourceMetadata,
             [&](Result r, const sp<IStreamIn>& result, const AudioConfig& suggestedConfig) {
                 retval = r;
                 if (retval == Result::OK) {