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

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

Properly init bta::av::bta_av_aact message structures 13/20 am: 52b501db am:... 

Properly init bta::av::bta_av_aact message structures 13/20 am: 52b501db am: 79228d70 am: 0011c63a

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



Change-Id: If40d50cbc97a1f6cf999834a15be5d123b02f8b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ceed590f 0011c63a

system/bta/av/bta_av_aact.cc

+16 −12
Original line number Diff line number Diff line
@@ -2397,26 +2397,30 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
                     ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), suspend,

                     p_scb->role, initiator);



    tBTA_AV_START start;

    start.suspending = suspend;

    start.initiator = initiator;

    start.chnl = p_scb->chnl;

    start.status = BTA_AV_SUCCESS;

    start.hndl = p_scb->hndl;

    tBTA_AV bta_av_data;

    bta_av_data.start = start;

    tBTA_AV bta_av_data = {

        .start =

            {

                .chnl = p_scb->chnl,

                .hndl = p_scb->hndl,

                .status = BTA_AV_SUCCESS,

                .initiator = initiator,

                .suspending = suspend,

            },

    };

    (*bta_av_cb.p_cback)(BTA_AV_START_EVT, &bta_av_data);



    if (suspend) {

      tBTA_AV_API_STOP stop;

      p_scb->role |= BTA_AV_ROLE_SUSPEND;

      p_scb->cong = true; /* do not allow the media data to go through */

      /* do not duplicate the media packets to this channel */

      p_scb->p_cos->stop(p_scb->hndl, p_scb->PeerAddress());

      p_scb->co_started = false;

      stop.flush = false;

      stop.suspend = true;

      stop.reconfig_stop = false;

      tBTA_AV_API_STOP stop = {

          .hdr = {},

          .suspend = true,

          .flush = false,

          .reconfig_stop = false,

      };

      bta_av_ssm_execute(p_scb, BTA_AV_AP_STOP_EVT, (tBTA_AV_DATA*)&stop);

    }

  }