Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6465c3a5 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Effect AIDL: Rename Flags.noProcessing to Flags.bypass" am: 7fd3c554... 

Merge "Effect AIDL: Rename Flags.noProcessing to Flags.bypass" am: 7fd3c554 am: 50b583ba am: dbf86382

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



Change-Id: Ie7fdd8e712f6f7f4e3652dd4e630e2e47982c1a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 673789b8 dbf86382

media/audioaidlconversion/AidlConversionEffect.cpp

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ ConversionResult<uint32_t> aidl2legacy_Flags_uint32(Flags aidl) { 
    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 @@ ConversionResult<Flags> legacy2aidl_uint32_Flags(uint32_t legacy) { 
    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;

}