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

Commit 6b17bb95 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 2/20" am: 735aeb1e 

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



Change-Id: I04192d55d2c73e04bab0b3361631eddfbb23e1ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 125d2977 735aeb1e

system/bta/av/bta_av_aact.cc

+10 −7
Original line number Diff line number Diff line
@@ -655,13 +655,16 @@ void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
        p_scb->role &= ~BTA_AV_ROLE_START_INT;

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

        /* start failed because of role switch. */

        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);

      } else {

        bta_av_start_ok(p_scb, p_data);