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

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

Merge "Properly init bta::av::bta_av_aact message structures 12/20" am: b2df79f1 

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



Change-Id: I967b5b961ab6abaa41c9ffc738eb317bad123e7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bad4027 b2df79f1

system/bta/av/bta_av_aact.cc

+10 −7
Original line number Diff line number Diff line
@@ -2279,13 +2279,16 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    p_scb->wait &= ~BTA_AV_WAIT_ROLE_SW_BITS;

    if (p_data->hdr.offset == BTA_AV_RS_FAIL) {

      bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress());

      tBTA_AV_START start;

      start.chnl = p_scb->chnl;

      start.status = BTA_AV_FAIL_ROLE;

      start.hndl = p_scb->hndl;

      start.initiator = initiator;

      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_FAIL_ROLE,

                  .initiator = initiator,

                  .suspending = false,

              },

      };

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

      return;

    }