commit accbe8a010ad6ea5dd293281c23ba3b142da6cca
author Mikhail Naganov <mnaganov@google.com> Thu Feb 03 23:45:36 2022 +0000
committer Mikhail Naganov <mnaganov@google.com> Fri Feb 04 18:24:13 2022 +0000
tree 018b46ec41df73b1f26d87ee61717d76bb3c6af9
parent d00fbcc39e346a6320e50df0a8e4d7ee92936bf7

Remove use of IStreamIn@7.1

This interface was a no-op, removed to save space.

Bug: 217752112
Test: atest VtsHalAudioV7_1TargetTest
Change-Id: Id8b39b4058371b72ca02af78c70be7daa5aa1e44

media/libaudiohal/impl/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index 8b09d76..94d08c3 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -311,13 +311,10 @@
         sinkMetadata.tracks[0].destination.device(std::move(hidlOutputDevice));
     }
 #endif
-#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
-    Return<void> ret = mDevice->openInputStream_7_1(
-#else
     Return<void> ret = mDevice->openInputStream(
-#endif
             handle, hidlDevice, hidlConfig, hidlFlags, sinkMetadata,
-            [&](Result r, const sp<::android::hardware::audio::CPP_VERSION::IStreamIn>& result,
+            [&](Result r,
+                const sp<::android::hardware::audio::CORE_TYPES_CPP_VERSION::IStreamIn>& result,
                     const AudioConfig& suggestedConfig) {
                 retval = r;
                 if (retval == Result::OK) {