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

Commit 677e358c authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Rename AudioPort to AudioPortFw am: c18e9a10 

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



Change-Id: I1b670834b37087e0948f9bcdcb595ec328a8783a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a5eb843 c18e9a10

media/libaudioclient/AidlConversion.cpp

+3 −3
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ status_t legacy2aidl_AudioPortExt( 
}



ConversionResult<audio_port_v7>

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) {

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPortFw& aidl) {

    audio_port_v7 legacy;

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));

    legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));
@@ -975,9 +975,9 @@ aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) { 
    return legacy;

}



ConversionResult<media::AudioPort>

ConversionResult<media::AudioPortFw>

legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) {

    media::AudioPort aidl;

    media::AudioPortFw aidl;

    aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));

    aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));

    aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type));

media/libaudioclient/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ aidl_interface { 
        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

        "aidl/android/media/AudioPatch.aidl",

        "aidl/android/media/AudioPort.aidl",

        "aidl/android/media/AudioPortFw.aidl",

        "aidl/android/media/AudioPortSys.aidl",

        "aidl/android/media/AudioPortConfigFw.aidl",

        "aidl/android/media/AudioPortConfigSys.aidl",

media/libaudioclient/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ status_t AudioSystem::listAudioPorts(audio_port_role_t role, 
            legacy2aidl_audio_port_type_t_AudioPortType(type));

    Int numPortsAidl;

    numPortsAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_ports));

    std::vector<media::AudioPort> portsAidl;

    std::vector<media::AudioPortFw> portsAidl;

    int32_t generationAidl;



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
@@ -1551,7 +1551,7 @@ status_t AudioSystem::getAudioPort(struct audio_port_v7* port) { 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPort portAidl;

    media::AudioPortFw portAidl;

    RETURN_STATUS_IF_ERROR(

            statusTFromBinderStatus(aps->getAudioPort(port->id, &portAidl)));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(portAidl));

media/libaudioclient/IAudioFlinger.cpp

+7 −6
Original line number Diff line number Diff line
@@ -666,8 +666,9 @@ status_t AudioFlingerClientAdapter::setLowRamDevice(bool isLowRamDevice, int64_t 
}



status_t AudioFlingerClientAdapter::getAudioPort(struct audio_port_v7* port) {

    media::AudioPort portAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_v7_AudioPort(*port));

    media::AudioPort aidlRet;

    media::AudioPortFw portAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

    media::AudioPortFw aidlRet;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->getAudioPort(portAidl, &aidlRet)));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(aidlRet));
@@ -805,7 +806,7 @@ int32_t AudioFlingerClientAdapter::getAAudioHardwareBurstMinUsec() { 


status_t AudioFlingerClientAdapter::setDeviceConnectedState(

        const struct audio_port_v7 *port, bool connected) {

    media::AudioPort aidlPort = VALUE_OR_RETURN_STATUS(

    media::AudioPortFw aidlPort = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

    return statusTFromBinderStatus(mDelegate->setDeviceConnectedState(aidlPort, connected));

}
@@ -1237,8 +1238,8 @@ Status AudioFlingerServerAdapter::setLowRamDevice(bool isLowRamDevice, int64_t t 
    return Status::fromStatusT(mDelegate->setLowRamDevice(isLowRamDevice, totalMemory));

}



Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPort& port,

                                               media::AudioPort* _aidl_return) {

Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPortFw& port,

                                               media::AudioPortFw* _aidl_return) {

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    RETURN_BINDER_IF_ERROR(mDelegate->getAudioPort(&portLegacy));

    *_aidl_return = VALUE_OR_RETURN_BINDER(legacy2aidl_audio_port_v7_AudioPort(portLegacy));
@@ -1354,7 +1355,7 @@ Status AudioFlingerServerAdapter::getAAudioHardwareBurstMinUsec(int32_t* _aidl_r 
}



Status AudioFlingerServerAdapter::setDeviceConnectedState(

        const media::AudioPort& port, bool connected) {

        const media::AudioPortFw& port, bool connected) {

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    return Status::fromStatusT(mDelegate->setDeviceConnectedState(&portLegacy, connected));

}

media/libaudioclient/aidl/android/media/AudioPort.aidl→media/libaudioclient/aidl/android/media/AudioPortFw.aidl

+2 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ import android.media.audio.common.AudioPort; 


/**

 * {@hide}

 * The Fw suffix is used to break a namespace collision with an SDK API.

 */

parcelable AudioPort {

parcelable AudioPortFw {

    AudioPort hal;

    AudioPortSys sys;

}