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

Commit 2ad065a9 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

pm_reg_db[BTM_MAX_PM_RECORDS + 1] is unused am: b34973da am: 8d555c53 am: b176d093 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1562452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00dbfb3ad253d74820d8552509386c1dc5d9258f
parents 761c6f04 b176d093

system/stack/acl/btm_pm.cc

+2 −8
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ tBTM_PM_MCB* btm_pm_get_power_manager_from_address(const RawAddress& bda) { 
  return nullptr;

  return nullptr;

}

}





tBTM_PM_RCB pm_reg_db[BTM_MAX_PM_RECORDS + 1]; /* per application/module */

tBTM_PM_RCB pm_reg_db[BTM_MAX_PM_RECORDS]; /* per application/module */





uint8_t pm_pend_id = 0; /* the id pf the module, which has a pending PM cmd */

uint8_t pm_pend_id = 0; /* the id pf the module, which has a pending PM cmd */
@@ -480,7 +480,6 @@ static tBTM_PM_PWR_MD* btm_pm_compare_modes(const tBTM_PM_PWR_MD* p_md1, 
static tBTM_PM_MODE btm_pm_get_set_mode(uint8_t pm_id, tBTM_PM_MCB* p_cb,

static tBTM_PM_MODE btm_pm_get_set_mode(uint8_t pm_id, tBTM_PM_MCB* p_cb,

                                        const tBTM_PM_PWR_MD* p_mode,

                                        const tBTM_PM_PWR_MD* p_mode,

                                        tBTM_PM_PWR_MD* p_res) {

                                        tBTM_PM_PWR_MD* p_res) {

  int xx, loop_max;

  tBTM_PM_PWR_MD* p_md = NULL;

  tBTM_PM_PWR_MD* p_md = NULL;





  if (p_mode != NULL && p_mode->mode & BTM_PM_MD_FORCE) {

  if (p_mode != NULL && p_mode->mode & BTM_PM_MD_FORCE) {
@@ -489,12 +488,7 @@ static tBTM_PM_MODE btm_pm_get_set_mode(uint8_t pm_id, tBTM_PM_MCB* p_cb, 
    return p_res->mode;

    return p_res->mode;

  }

  }





  if (!p_mode)

  for (int xx = 0; xx < BTM_MAX_PM_RECORDS; xx++) {

    loop_max = BTM_MAX_PM_RECORDS + 1;

  else

    loop_max = BTM_MAX_PM_RECORDS;



  for (xx = 0; xx < loop_max; xx++) {

    /* g through all the registered "set" parties */

    /* g through all the registered "set" parties */

    if (pm_reg_db[xx].mask & BTM_PM_REG_SET) {

    if (pm_reg_db[xx].mask & BTM_PM_REG_SET) {

      if (p_cb->req_mode[xx].mode == BTM_PM_MD_ACTIVE) {

      if (p_cb->req_mode[xx].mode == BTM_PM_MD_ACTIVE) {