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

Commit 9f0f3038 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 1/20" am: bd20e566 

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



Change-Id: I1556cc0a67057770bf9376ad21f8d0b044c80257
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cfe543a bd20e566

system/bta/av/bta_av_aact.cc

+11 −7
Original line number Diff line number Diff line
@@ -244,16 +244,20 @@ static void notify_start_failed(tBTA_AV_SCB* p_scb) { 
  LOG_ERROR("%s: peer %s role:0x%x bta_channel:%d bta_handle:0x%x", __func__,

            ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->role,

            p_scb->chnl, p_scb->hndl);

  tBTA_AV_START start;

  tBTA_AV bta_av_data = {

      .start =

          {

              .chnl = p_scb->chnl,

              .hndl = p_scb->hndl,

              .status = BTA_AV_FAIL,

              .initiator = true,

              .suspending = false,

          },

  };



  /* if start failed, clear role */

  p_scb->role &= ~BTA_AV_ROLE_START_INT;

  start.chnl = p_scb->chnl;

  start.status = BTA_AV_FAIL;

  start.initiator = true;

  start.hndl = p_scb->hndl;



  tBTA_AV bta_av_data;

  bta_av_data.start = start;

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

}