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

Commit 5f6e5e59 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/bta/av: Removed unused method bta_av_chk_2nd_start 

Test: m com.android.btservices
Bug: 331817295
Flag: EXEMPT, dead code removal
Change-Id: Ia770ae21f845bb74bcafee2fae84d019e64837b7
parent 82f829de

system/bta/av/bta_av_aact.cc

+0 −53
Original line number Diff line number Diff line
@@ -2930,59 +2930,6 @@ void bta_av_security_rej(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
                   NULL, 0);

}



/*******************************************************************************

 *

 * Function         bta_av_chk_2nd_start

 *

 * Description      check if this is 2nd stream and if it needs to be started.

 *                  This function needs to be kept very similar to

 *                  bta_av_chk_start

 *

 * Returns          void

 *

 ******************************************************************************/

void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb,

                          UNUSED_ATTR tBTA_AV_DATA* p_data) {

  log::info(

      "peer {} channel:{} bta_av_cb.audio_open_cnt:{} role:0x{:x} "

      "features:0x{:x}",

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

      bta_av_cb.audio_open_cnt, p_scb->role, bta_av_cb.features);



  if ((p_scb->chnl == BTA_AV_CHNL_AUDIO) && (bta_av_cb.audio_open_cnt >= 2) &&

      (((p_scb->role & BTA_AV_ROLE_AD_ACP) == 0) ||  // Outgoing connection or

       (bta_av_cb.features & BTA_AV_FEAT_ACP_START))) {  // Auto-starting option

    // More than one audio channel is connected.

    if (!(p_scb->role & BTA_AV_ROLE_SUSPEND_OPT)) {

      // This channel does not need to be reconfigured.

      // If there is other channel streaming, start the stream now.

      bool new_started = false;

      for (int i = 0; i < BTA_AV_NUM_STRS; i++) {

        tBTA_AV_SCB* p_scbi = bta_av_cb.p_scb[i];

        if (p_scb == p_scbi) {

          continue;

        }

        if (p_scbi && p_scbi->chnl == BTA_AV_CHNL_AUDIO && p_scbi->co_started) {

          if (!new_started) {

            // Start the new stream

            new_started = true;

            log::info(

                "starting new stream for peer {} because peer {} already "

                "started",

                ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()),

                ADDRESS_TO_LOGGABLE_CSTR(p_scbi->PeerAddress()));

            bta_av_ssm_execute(p_scb, BTA_AV_AP_START_EVT, NULL);

          }

          // May need to update the flush timeout of this already started stream

          if (p_scbi->co_started != bta_av_cb.audio_open_cnt) {

            p_scbi->co_started = bta_av_cb.audio_open_cnt;

          }

        }

      }

    }

  }

}



/*******************************************************************************

 *

 * Function         bta_av_open_rc

system/bta/av/bta_av_int.h

+0 −1
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data); 
void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_security_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_open_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_chk_2nd_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_save_caps(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

void bta_av_rej_conn(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data);

system/bta/av/bta_av_main.cc

+0 −2
Original line number Diff line number Diff line
@@ -848,8 +848,6 @@ static void bta_av_api_to_ssm(tBTA_AV_DATA* p_data) { 
 *

 * Description      if this is audio channel, check if more than one audio

 *                  channel is connected & already started.

 *                  This function needs to be kept very similar to

 *                  bta_av_chk_2nd_start

 *

 * Returns          true, if need api_start

 *