commit 866c77d231ce113fb8693354d1aa64004834cc83
author Mikhail Naganov <mnaganov@google.com> Fri Jul 30 15:11:35 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Fri Jul 30 15:12:08 2021 -0700
tree 6adac66d9efcf6c8a1ef6faba392929aeedc2d25
parent de3fa1818a2f5f615a3b3ff1a58940f03b0ba8fc

Revert "Revert "Rename AudioGain.useInChannelMask -> isInput""

This reverts commit 05399f489aece403775f34cd2c2233243e2d5654.

This is done for consistency with other data structures
and conversion functions.

Bug: 188932434
Test: atest audiofoundation_parcelable_test
Change-Id: Ie98f6063625295c6796c49fdb09107d66546814f

media/libaudioclient/AidlConversion.cpp

diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index fd6bf28..4c155fe 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -2777,7 +2777,7 @@
     audio_gain legacy;
     legacy.mode = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_gain_mode_t_mask(aidl.mode));
     legacy.channel_mask = VALUE_OR_RETURN(aidl2legacy_AudioChannelLayout_audio_channel_mask_t(
-                    aidl.channelMask, aidl.useInChannelMask));
+                    aidl.channelMask, aidl.isInput));
     legacy.min_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.minValue));
     legacy.max_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.maxValue));
     legacy.default_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.defaultValue));
@@ -2791,7 +2791,7 @@
 legacy2aidl_audio_gain_AudioGain(const audio_gain& legacy, bool isInput) {
     media::AudioGain aidl;
     aidl.mode = VALUE_OR_RETURN(legacy2aidl_audio_gain_mode_t_int32_t_mask(legacy.mode));
-    aidl.useInChannelMask = isInput;
+    aidl.isInput = isInput;
     aidl.channelMask = VALUE_OR_RETURN(
             legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput));
     aidl.minValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.min_value));