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

Commit de07fce6 authored by Chris Manton's avatar Chris Manton
Browse files

Replace bta::BTA_DM_[NON|CONN] => stack::btm::BTM_[NON_]CONNECTABLE 

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

Change-Id: I19595a6430f7b83ba752d7906f1f28e54d2f4726
parent 5162279c

system/bta/dm/bta_dm_act.cc

+5 −5
Original line number Diff line number Diff line
@@ -418,22 +418,22 @@ bool BTA_DmSetVisibility(bt_scan_mode_t mode) { 
  switch (mode) {

    case BT_SCAN_MODE_NONE:

      disc_mode_param = BTA_DM_NON_DISC;

      conn_mode_param = BTA_DM_NON_CONN;

      conn_mode_param = BTM_NON_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE:

      disc_mode_param = BTA_DM_NON_DISC;

      conn_mode_param = BTA_DM_CONN;

      conn_mode_param = BTM_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE:

      disc_mode_param = BTA_DM_GENERAL_DISC;

      conn_mode_param = BTA_DM_CONN;

      conn_mode_param = BTM_CONNECTABLE;

      break;



    case BT_SCAN_MODE_CONNECTABLE_LIMITED_DISCOVERABLE:

      disc_mode_param = BTA_DM_LIMITED_DISC;

      conn_mode_param = BTA_DM_CONN;

      conn_mode_param = BTM_CONNECTABLE;

      break;



    default:
@@ -1600,7 +1600,7 @@ void bta_dm_allow_wake_by_hid( 
  // If there are any entries in the classic hid list, we should also make

  // the adapter connectable for classic.

  if (classic_hid_devices.size() > 0) {

    if (BTM_SetConnectability(BTA_DM_CONN) != BTM_SUCCESS) {

    if (BTM_SetConnectability(BTM_CONNECTABLE) != BTM_SUCCESS) {

      log::warn("Unable to set connectability");

    }

  }

system/bta/include/bta_api.h

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ typedef uint16_t 
                     LE mode */



/* Connectable Modes */

#define BTA_DM_NON_CONN BTM_NON_CONNECTABLE /* Device is not connectable. */

#define BTA_DM_CONN BTM_CONNECTABLE         /* Device is connectable. */



typedef uint16_t tBTA_DM_CONN;



/* Central/peripheral preferred roles */