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

Commit ec4f2b5b authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Class enum-ify bta::tBTA_DM_CONN_STATE am: d815bcc5 

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



Change-Id: Ie9ccd25459bcf0aaa5a812acc9138a8cb10ce55c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10dc14af d815bcc5

system/bta/dm/bta_dm_act.cc

+14 −10
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
    for (int i = 0; i < bta_dm_cb.device_list.count; i++) {

      auto& peer_device = bta_dm_cb.device_list.peer_device[i];

      if (peer_device.peer_bdaddr == bd_addr) {

        peer_device.conn_state = BTA_DM_UNPAIRING;

        peer_device.conn_state = tBTA_DM_CONN_STATE::BTA_DM_UNPAIRING;



        /* Make sure device is not in acceptlist before we disconnect */

        if (!GATT_CancelConnect(0, bd_addr, false)) {
@@ -561,7 +561,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
      auto& peer_device = bta_dm_cb.device_list.peer_device[i];

      if (peer_device.peer_bdaddr == other_address &&

          peer_device.transport == other_transport) {

        peer_device.conn_state = BTA_DM_UNPAIRING;

        peer_device.conn_state = tBTA_DM_CONN_STATE::BTA_DM_UNPAIRING;

        log::info("Remove ACL of address {}", other_address);



        /* Make sure device is not in acceptlist before we disconnect */
@@ -717,7 +717,7 @@ static void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, 
  }

  log::info("Acl connected peer:{} transport:{} handle:{}", bd_addr,

            bt_transport_text(transport), acl_handle);

  device->conn_state = BTA_DM_CONNECTED;

  device->conn_state = tBTA_DM_CONN_STATE::BTA_DM_CONNECTED;

  device->pref_role = BTA_ANY_ROLE;

  device->reset_device_info();

  device->transport = transport;
@@ -778,7 +778,7 @@ static void bta_dm_acl_down(const RawAddress& bd_addr, 
    if (device->peer_bdaddr != bd_addr || device->transport != transport)

      continue;



    if (device->conn_state == BTA_DM_UNPAIRING) {

    if (device->conn_state == tBTA_DM_CONN_STATE::BTA_DM_UNPAIRING) {

      issue_unpair_cb = get_btm_client_interface().security.BTM_SecDeleteDevice(

          device->peer_bdaddr);
@@ -871,7 +871,8 @@ static void bta_dm_check_av() { 
      p_dev = &bta_dm_cb.device_list.peer_device[i];

      log::warn("[{}]: state:{}, info:{}", i, p_dev->conn_state,

                p_dev->info_text());

      if ((p_dev->conn_state == BTA_DM_CONNECTED) && p_dev->is_av_active()) {

      if ((p_dev->conn_state == tBTA_DM_CONN_STATE::BTA_DM_CONNECTED) &&

          p_dev->is_av_active()) {

        /* make central and take away the role switch policy */

        const tBTM_STATUS status =

            get_btm_client_interface().link_policy.BTM_SwitchRoleToCentral(
@@ -947,8 +948,8 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id, 
       * switch command.

       * But this should not be done if we are in the middle of unpairing.

       */

      if (p_dev->conn_state != BTA_DM_UNPAIRING)

        p_dev->conn_state = BTA_DM_CONNECTED;

      if (p_dev->conn_state != tBTA_DM_CONN_STATE::BTA_DM_UNPAIRING)

        p_dev->conn_state = tBTA_DM_CONN_STATE::BTA_DM_CONNECTED;



      for (j = 1; j <= p_bta_dm_rm_cfg[0].app_id; j++) {

        if (((p_bta_dm_rm_cfg[j].app_id == app_id) ||
@@ -1015,7 +1016,8 @@ static void bta_dm_adjust_roles(bool delay_role_switch) { 
  uint8_t link_count = bta_dm_cb.device_list.count;

  if (link_count) {

    for (i = 0; i < bta_dm_cb.device_list.count; i++) {

      if (bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_CONNECTED &&

      if (bta_dm_cb.device_list.peer_device[i].conn_state ==

              tBTA_DM_CONN_STATE::BTA_DM_CONNECTED &&

          bta_dm_cb.device_list.peer_device[i].transport ==

              BT_TRANSPORT_BR_EDR) {

        if ((bta_dm_cb.device_list.peer_device[i].pref_role ==
@@ -1417,7 +1419,8 @@ tBTA_DM_PEER_DEVICE* find_connected_device(const RawAddress& bd_addr, 
                                           tBT_TRANSPORT /* transport */) {

  for (uint8_t i = 0; i < bta_dm_cb.device_list.count; i++) {

    if (bta_dm_cb.device_list.peer_device[i].peer_bdaddr == bd_addr &&

        bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_CONNECTED)

        bta_dm_cb.device_list.peer_device[i].conn_state ==

            tBTA_DM_CONN_STATE::BTA_DM_CONNECTED)

      return &bta_dm_cb.device_list.peer_device[i];

  }

  return nullptr;
@@ -1492,7 +1495,8 @@ static tBTM_CONTRL_STATE bta_dm_obtain_system_context() { 


  for (int i = 0; i < bta_dm_cb.device_list.count; i++) {

    tBTA_DM_PEER_DEVICE* p_dev = &bta_dm_cb.device_list.peer_device[i];

    if (p_dev->conn_state == BTA_DM_CONNECTED && p_dev->is_av_active()) {

    if (p_dev->conn_state == tBTA_DM_CONN_STATE::BTA_DM_CONNECTED &&

        p_dev->is_av_active()) {

      is_av_active = true;

      break;

    }

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void BTA_DmDiscover(const RawAddress& bd_addr, 
 ******************************************************************************/

bool BTA_DmGetConnectionState(const RawAddress& bd_addr) {

  tBTA_DM_PEER_DEVICE* p_dev = bta_dm_find_peer_device(bd_addr);

  return (p_dev && p_dev->conn_state == BTA_DM_CONNECTED);

  return (p_dev && p_dev->conn_state == tBTA_DM_CONN_STATE::BTA_DM_CONNECTED);

}



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

system/bta/dm/bta_dm_int.h

+7 −8
Original line number Diff line number Diff line
@@ -47,20 +47,19 @@ 


#define BTA_DM_NUM_PEER_DEVICE 7



typedef enum : uint8_t {

enum class tBTA_DM_CONN_STATE : uint8_t {

  BTA_DM_NOT_CONNECTED = 0,

  BTA_DM_CONNECTED = 1,

  BTA_DM_UNPAIRING = 2,

} tBTA_DM_CONN_STATE;

};



inline std::string bta_conn_state_text(tBTA_DM_CONN_STATE state) {

  switch (state) {

    CASE_RETURN_TEXT(BTA_DM_NOT_CONNECTED);

    CASE_RETURN_TEXT(BTA_DM_CONNECTED);

    CASE_RETURN_TEXT(BTA_DM_UNPAIRING);

    default:

      return std::string("UNKNOWN");

    CASE_RETURN_STRING(tBTA_DM_CONN_STATE::BTA_DM_NOT_CONNECTED);

    CASE_RETURN_STRING(tBTA_DM_CONN_STATE::BTA_DM_CONNECTED);

    CASE_RETURN_STRING(tBTA_DM_CONN_STATE::BTA_DM_UNPAIRING);

  }

  RETURN_UNKNOWN_TYPE_STRING(tBTA_DM_CONN_STATE, state);

}



typedef enum : uint8_t {
@@ -98,7 +97,7 @@ typedef uint8_t tBTA_DM_PM_REQ; 


struct tBTA_DM_PEER_DEVICE {

  RawAddress peer_bdaddr;

  tBTA_DM_CONN_STATE conn_state;

  tBTA_DM_CONN_STATE conn_state{tBTA_DM_CONN_STATE::BTA_DM_NOT_CONNECTED};

  tBTA_PREF_ROLES pref_role;

  bool in_use;

system/bta/test/bta_dm_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ TEST_F(BtaDmTest, bta_dm_set_encryption) { 
  tBTA_DM_PEER_DEVICE* device =

      bluetooth::legacy::testing::allocate_device_for(kRawAddress, transport);

  ASSERT_TRUE(device != nullptr);

  device->conn_state = BTA_DM_CONNECTED;

  device->conn_state = tBTA_DM_CONN_STATE::BTA_DM_CONNECTED;

  device->p_encrypt_cback = nullptr;



  // Setup a device that is busy with another encryption
@@ -276,7 +276,7 @@ TEST_F(BtaDmTest, bta_dm_encrypt_cback) { 
  tBTA_DM_PEER_DEVICE* device =

      bluetooth::legacy::testing::allocate_device_for(kRawAddress, transport);

  ASSERT_TRUE(device != nullptr);

  device->conn_state = BTA_DM_CONNECTED;

  device->conn_state = tBTA_DM_CONN_STATE::BTA_DM_CONNECTED;



  // Encryption with no callback set

  device->p_encrypt_cback = nullptr;