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

Commit 186cdca3 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Move 'session' field to AudioPortExtSys AIDL 

The 'session' field is only used by the framework (if at all),
so it was moved from the HAL AIDL to the system-specific part.

Bug: 205884982
Test: m
Change-Id: I352552488899459055724e74545cb0f81f2e7eab
parent 0202e797

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;

}