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

Commit 7ccf2239 authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to... 

Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" am: 43a4b4cf am: 6daa0781
am: 7b09211e

Change-Id: Id1bb981a8432a28e7c42346fd97ab81cc3e315dc
parents 8eb07195 7b09211e

system/bta/av/bta_av_aact.cc

+2 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,6 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    open.chnl = p_scb->chnl;

    open.hndl = p_scb->hndl;

    open.status = BTA_AV_SUCCESS;

    open.starting = bta_av_chk_start(p_scb);

    open.edr = 0;

    p = BTM_ReadRemoteFeatures(p_scb->PeerAddress());

    if (p != NULL) {
@@ -1262,8 +1261,10 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr, p_scb->hdi);

#endif

    if (p_scb->seps[p_scb->sep_idx].tsep == AVDT_TSEP_SRC) {

      open.starting = false;

      open.sep = AVDT_TSEP_SNK;

    } else if (p_scb->seps[p_scb->sep_idx].tsep == AVDT_TSEP_SNK) {

      open.starting = bta_av_chk_start(p_scb);

      open.sep = AVDT_TSEP_SRC;

    }

system/bta/av/bta_av_ssm.cc

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static const uint8_t bta_av_sst_open[][BTA_AV_NUM_COLS] = { 
    /* STR_RECONFIG_CFM_EVT */

    {BTA_AV_SIGNORE, BTA_AV_SIGNORE, BTA_AV_OPEN_SST},

    /* AVRC_TIMER_EVT */

    {BTA_AV_OPEN_RC, BTA_AV_CHK_2ND_START, BTA_AV_OPEN_SST},

    {BTA_AV_OPEN_RC, BTA_AV_SIGNORE, BTA_AV_OPEN_SST},

    /* AVDT_CONNECT_EVT */ {BTA_AV_SIGNORE, BTA_AV_SIGNORE, BTA_AV_OPEN_SST},

    /* AVDT_DISCONNECT_EVT */

    {BTA_AV_STR_CLOSED, BTA_AV_SIGNORE, BTA_AV_INIT_SST},