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

Commit db4018d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Remove duplicate check for SCO active bta_dm_pm_ssr" am:... 

Merge "legacy: Remove duplicate check for SCO active bta_dm_pm_ssr" am: e2d20de4 am: 4a488d5e am: b9f566e7 am: d9118ea9

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

Change-Id: I4ba5cc1c9dbacdcbc5842cef96eb545a25bc9320
parents 17570c49 d9118ea9

system/bta/dm/bta_dm_pm.cc

+5 −32
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static void bta_dm_pm_btm_cback(const RawAddress& bd_addr, 
                                tHCI_STATUS hci_status);

static bool bta_dm_pm_park(const RawAddress& peer_addr);

void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index);

static bool bta_dm_pm_is_sco_active();

static int bta_dm_get_sco_index();

static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER* p_timer,

                                          uint8_t timer_idx);
@@ -815,7 +814,6 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, int ssr) { 


  if (p_spec->max_lat) {

    /* Avoid SSR reset on device which has SCO connected */

    if (bta_dm_pm_is_sco_active()) {

    int idx = bta_dm_get_sco_index();

    if (idx != -1) {

      if (bta_dm_conn_srvcs.conn_srvc[idx].peer_bdaddr == peer_addr) {
@@ -823,7 +821,6 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, int ssr) { 
        return;

      }

    }

    }



    LOG_DEBUG(

        "Setting sniff subrating for device:%s spec_name:%s max_latency(s):%.2f"
@@ -1047,30 +1044,6 @@ tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr) { 
  return p_dev;

}



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

 *

 * Function         bta_dm_is_sco_active

 *

 * Description      Loop through connected services for HFP+State=SCO

 *

 * Returns          bool. true if SCO active, else false

 *

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

static bool bta_dm_pm_is_sco_active() {

  int j;

  bool bScoActive = false;



  for (j = 0; j < bta_dm_conn_srvcs.count; j++) {

    /* check if an entry already present */

    if ((bta_dm_conn_srvcs.conn_srvc[j].id == BTA_ID_AG) &&

        (bta_dm_conn_srvcs.conn_srvc[j].state == BTA_SYS_SCO_OPEN)) {

      bScoActive = true;

      break;

    }

  }

  return bScoActive;

}



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

 *

 * Function        bta_dm_get_sco_index