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

Commit 5dd885e4 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 19/20" am: 09c249c5 am: f612f2e2 

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



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

system/bta/av/bta_av_aact.cc

+8 −4
Original line number Original line Diff line number Diff line
@@ -2737,10 +2737,14 @@ void bta_av_suspend_cont(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  if (err_code) {

  if (err_code) {

    if (AVDT_ERR_CONNECT == err_code) {

    if (AVDT_ERR_CONNECT == err_code) {

      /* report failure */

      /* report failure */

      tBTA_AV_RECONFIG reconfig;

      tBTA_AV bta_av_data = {

      reconfig.status = BTA_AV_FAIL;

          .reconfig =

      tBTA_AV bta_av_data;

              {

      bta_av_data.reconfig = reconfig;

                  .chnl = p_scb->chnl,

                  .hndl = p_scb->hndl,

                  .status = BTA_AV_FAIL,

              },

      };

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

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

      APPL_TRACE_ERROR("%s: BTA_AV_STR_DISC_FAIL_EVT: peer_addr=%s", __func__,

      APPL_TRACE_ERROR("%s: BTA_AV_STR_DISC_FAIL_EVT: peer_addr=%s", __func__,

                       ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()));

                       ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()));