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

Commit 2032ed2d authored by Chris Manton's avatar Chris Manton
Browse files

[24/24] Canonical form tBTM_STATUS::BTM_WRONG_MODE 

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Id6f558568b25ffe8d7696f1bc41a28875b924fad
parent 8ad455fa

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ void bta_dm_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport, void* /* 
  switch (result) {

    case tBTM_STATUS::BTM_SUCCESS:

      break;

    case BTM_WRONG_MODE:

    case tBTM_STATUS::BTM_WRONG_MODE:

      bta_status = BTA_WRONG_MODE;

      break;

    case tBTM_STATUS::BTM_NO_RESOURCES:

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) 
    if (!(p_cb->status == BTA_HH_ERR_SEC &&

          (p_cb->btm_status == tBTM_STATUS::BTM_ERR_PROCESSING ||

           p_cb->btm_status == tBTM_STATUS::BTM_FAILED_ON_SECURITY ||

           p_cb->btm_status == BTM_WRONG_MODE))) {

           p_cb->btm_status == tBTM_STATUS::BTM_WRONG_MODE))) {

      bta_hh_le_api_disc_act(p_cb);

    }

  }

system/bta/test/bta_dm_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ TEST_F(BtaDmTest, bta_dm_encrypt_cback) { 
  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, tBTM_STATUS::BTM_SUCCESS);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_WRONG_MODE);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, tBTM_STATUS::BTM_WRONG_MODE);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, tBTM_STATUS::BTM_NO_RESOURCES);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

system/stack/acl/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) { 
  if (pwr_mode == BTM_PM_MD_PARK || pwr_mode == BTM_PM_MD_SNIFF) {

    if (!BTM_SetLinkPolicyActiveMode(p_acl->remote_addr)) {

      log::warn("Unable to set link policy active before attempting switch");

      return BTM_WRONG_MODE;

      return tBTM_STATUS::BTM_WRONG_MODE;

    }

    p_acl->set_switch_role_changing();

  }

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ std::pair<uint16_t /* interval */, uint16_t /* window */> get_low_latency_scan_p 
 ******************************************************************************/

tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, tBTM_INQ_RESULTS_CB* p_results_cb,

                           tBTM_CMPL_CB* p_cmpl_cb) {

  tBTM_STATUS status = BTM_WRONG_MODE;

  tBTM_STATUS status = tBTM_STATUS::BTM_WRONG_MODE;

  uint8_t scan_phy = !btm_cb.ble_ctr_cb.inq_var.scan_phy ? BTM_BLE_DEFAULT_PHYS

                                                         : btm_cb.ble_ctr_cb.inq_var.scan_phy;
@@ -2497,7 +2497,7 @@ static bool btm_ble_adv_states_operation(BTM_TOPOLOGY_FUNC_PTR* p_handler, uint8 
 ******************************************************************************/

static tBTM_STATUS btm_ble_start_adv(void) {

  if (!btm_ble_adv_states_operation(btm_ble_topology_check, btm_cb.ble_ctr_cb.inq_var.evt_type)) {

    return BTM_WRONG_MODE;

    return tBTM_STATUS::BTM_WRONG_MODE;

  }



  btsnd_hcic_ble_set_adv_enable(BTM_BLE_ADV_ENABLE);