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

Commit 23c66845 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move 'session' field to AudioPortExtSys AIDL" am: d0eb45c1 am:... 

Merge "Move 'session' field to AudioPortExtSys AIDL" am: d0eb45c1 am: 19591538 am: 4daf4714 am: 898612e3

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



Change-Id: Id5273ef0a1dc36d9a178cadd54f310a79054e30b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cd68854 898612e3

media/libaudioclient/AidlConversion.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1932,7 +1932,7 @@ ConversionResult<audio_port_config_ext> aidl2legacy_AudioPortExt_audio_port_conf 
        case media::AudioPortType::SESSION:

            legacy.session = VALUE_OR_RETURN(

                    aidl2legacy_int32_t_audio_port_config_session_ext(

                            VALUE_OR_RETURN(UNION_GET(aidl, session))));

                            VALUE_OR_RETURN(UNION_GET(aidlSys, session))));

            return legacy;



    }
@@ -1966,9 +1966,9 @@ status_t legacy2aidl_AudioPortExt( 
            return OK;

        }

        case AUDIO_PORT_TYPE_SESSION:

            UNION_SET(*aidl, session, VALUE_OR_RETURN_STATUS(

            UNION_SET(*aidl, unspecified, false);

            UNION_SET(*aidlSys, session, VALUE_OR_RETURN_STATUS(

                            legacy2aidl_audio_port_config_session_ext_int32_t(legacy.session)));

            UNION_SET(*aidlSys, unspecified, false);

            return OK;

    }

    LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail
@@ -2816,7 +2816,7 @@ ConversionResult<audio_port_v7_ext> aidl2legacy_AudioPortExt_audio_port_v7_ext( 
        case media::AudioPortType::SESSION:

            legacy.session = VALUE_OR_RETURN(

                    aidl2legacy_int32_t_audio_port_session_ext(

                            VALUE_OR_RETURN(UNION_GET(aidl, session))));

                            VALUE_OR_RETURN(UNION_GET(aidlSys, session))));

            return legacy;



    }
@@ -2852,9 +2852,9 @@ status_t legacy2aidl_AudioPortExt( 
            return OK;

        }

        case AUDIO_PORT_TYPE_SESSION:

            UNION_SET(*aidl, session, VALUE_OR_RETURN_STATUS(

            UNION_SET(*aidl, unspecified, false);

            UNION_SET(*aidlSys, session, VALUE_OR_RETURN_STATUS(

                            legacy2aidl_audio_port_session_ext_int32_t(legacy.session)));

            UNION_SET(*aidlSys, unspecified, false);

            return OK;

    }

    LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail

media/libaudioclient/aidl/android/media/AudioPortExtSys.aidl

+2 −0
Original line number Diff line number Diff line
@@ -31,4 +31,6 @@ union AudioPortExtSys { 
    AudioPortDeviceExtSys device;

    /** System-only parameters when the port is an audio mix. */

    AudioPortMixExtSys mix;

    /** Framework audio session identifier. */

    int session;

}