commit dbf86382bbb1f3be96d4790a16c559c721f4eeed
author Shunkai Yao <yaoshunkai@google.com> Fri Feb 03 02:50:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 03 02:50:15 2023 +0000
tree e0b4567ea41a29650ff5f6247375a411ecd14b23
parent 3717598e299e0f79001709651e6cbbdfc252c563
parent 50b583ba65af50b3b49abc7997bf98066350f6a9

Merge "Effect AIDL: Rename Flags.noProcessing to Flags.bypass" am: 7fd3c554f4 am: 50b583ba65

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2420183

Change-Id: I31bf3c654658482225c3f8306a85099a91211f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/audioaidlconversion/AidlConversionEffect.cpp

diff --git a/media/audioaidlconversion/AidlConversionEffect.cpp b/media/audioaidlconversion/AidlConversionEffect.cpp
index 062fc9f..ad27c64 100644
--- a/media/audioaidlconversion/AidlConversionEffect.cpp
+++ b/media/audioaidlconversion/AidlConversionEffect.cpp
@@ -153,7 +153,7 @@
     if (aidl.audioSourceIndication) {
         legacy |= EFFECT_FLAG_AUDIO_SOURCE_IND;
     }
-    if (aidl.noProcessing) {
+    if (aidl.bypass) {
         legacy |= EFFECT_FLAG_NO_PROCESS;
     }
     return legacy;
@@ -170,7 +170,7 @@
     aidl.deviceIndication = (legacy & EFFECT_FLAG_DEVICE_IND);
     aidl.audioModeIndication = (legacy & EFFECT_FLAG_AUDIO_MODE_IND);
     aidl.audioSourceIndication = (legacy & EFFECT_FLAG_AUDIO_SOURCE_IND);
-    aidl.noProcessing = (legacy & EFFECT_FLAG_NO_PROCESS);
+    aidl.bypass = (legacy & EFFECT_FLAG_NO_PROCESS);
     return aidl;
 }