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

Commit c79961f9 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Properly init bta::av::bta_av_aact message structures 4/20 am: 7321894c am:... 

Properly init bta::av::bta_av_aact message structures 4/20 am: 7321894c am: 71bcb050 am: c0a96df2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2323921



Change-Id: I784ed4a56c5e839494a78e3a41d4820dcae9455a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents effe636e c0a96df2

system/bta/av/bta_av_aact.cc

+9 −6
Original line number Diff line number Diff line
@@ -1218,12 +1218,15 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
     * the connection will be rejected.

     */

    /* check if other audio channel is started. If yes, start */

    tBTA_AV_OPEN open;

    open.bd_addr = p_scb->PeerAddress();

    open.chnl = p_scb->chnl;

    open.hndl = p_scb->hndl;

    open.status = BTA_AV_SUCCESS;

    open.edr = 0;

    tBTA_AV_OPEN open = {

        .chnl = p_scb->chnl,

        .hndl = p_scb->hndl,

        .bd_addr = p_scb->PeerAddress(),

        .status = BTA_AV_SUCCESS,

        .starting = false,

        .edr = 0,

        .sep = AVDT_TSEP_INVALID,

    };

    p = BTM_ReadRemoteFeatures(p_scb->PeerAddress());

    if (p != NULL) {

      if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_2MBPS;