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

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

Merge changes I1f6a908f,I96781ecd,I4de2d029,Ib3e5580a,I5b615bb3 am: e697eef8 

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

Change-Id: I15b5a2ad2e14b70ec5833ce1b3856a65c5836247
parents 23d28369 e697eef8

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ void bta_dm_disable() { 
  /* disable all active subsystems */

  bta_sys_disable();



  BTM_SetDiscoverability(BTM_NON_DISCOVERABLE, 0, 0);

  BTM_SetConnectability(BTM_NON_CONNECTABLE, 0, 0);

  BTM_SetDiscoverability(BTM_NON_DISCOVERABLE);

  BTM_SetConnectability(BTM_NON_CONNECTABLE);



  bta_dm_disable_pm();

  bta_dm_disable_search_and_disc();
@@ -513,8 +513,8 @@ bool BTA_DmSetVisibility(bt_scan_mode_t mode) { 
      return false;

  }



  BTM_SetDiscoverability(disc_mode_param, 0, 0);

  BTM_SetConnectability(conn_mode_param, 0, 0);

  BTM_SetDiscoverability(disc_mode_param);

  BTM_SetConnectability(conn_mode_param);

  return true;

}

system/main/shim/btm_api.cc

+0 −22
Original line number Diff line number Diff line
@@ -451,17 +451,6 @@ tBTM_STATUS bluetooth::shim::BTM_SetInquiryMode(uint8_t inquiry_mode) { 
  return BTM_SUCCESS;

}



uint16_t bluetooth::shim::BTM_ReadDiscoverability(uint16_t* p_window,

                                                  uint16_t* p_interval) {

  DiscoverabilityState state =

      Stack::GetInstance()->GetBtm()->GetClassicDiscoverabilityState();



  if (p_interval) *p_interval = state.interval;

  if (p_window) *p_window = state.window;



  return state.mode;

}



tBTM_STATUS bluetooth::shim::BTM_SetConnectability(uint16_t page_mode,

                                                   uint16_t window,

                                                   uint16_t interval) {
@@ -497,17 +486,6 @@ tBTM_STATUS bluetooth::shim::BTM_SetConnectability(uint16_t page_mode, 
  return BTM_SUCCESS;

}



uint16_t bluetooth::shim::BTM_ReadConnectability(uint16_t* p_window,

                                                 uint16_t* p_interval) {

  ConnectabilityState state =

      Stack::GetInstance()->GetBtm()->GetClassicConnectabilityState();



  if (p_window) *p_window = state.window;

  if (p_interval) *p_interval = state.interval;



  return state.mode;

}



uint16_t bluetooth::shim::BTM_IsInquiryActive(void) {

  if (Stack::GetInstance()->GetBtm()->IsGeneralInquiryActive()) {

    return BTM_GENERAL_INQUIRY_ACTIVE;

system/main/shim/btm_api.h

+0 −30
Original line number Diff line number Diff line
@@ -118,22 +118,6 @@ void BTM_EnableInterlacedPageScan(); 
 ******************************************************************************/

tBTM_STATUS BTM_SetInquiryMode(uint8_t mode);



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

 *

 * Function         BTM_ReadDiscoverability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 *

 * Output Params:   p_window - current inquiry scan duration

 *                  p_interval - current inquiry scan interval

 *

 * Returns          BTM_NON_DISCOVERABLE, BTM_LIMITED_DISCOVERABLE, or

 *                  BTM_GENERAL_DISCOVERABLE

 *

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

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval);



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

 *

 * Function         BTM_SetConnectability
@@ -151,20 +135,6 @@ uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval); 
tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window,

                                  uint16_t interval);



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

 *

 * Function         BTM_ReadConnectability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 * Output Params    p_window - current page scan duration

 *                  p_interval - current time between page scans

 *

 * Returns          BTM_NON_CONNECTABLE or BTM_CONNECTABLE

 *

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

uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval);



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

 *

 * Function         BTM_IsInquiryActive

system/stack/btm/btm_devctl.cc

+2 −2
Original line number Diff line number Diff line
@@ -609,12 +609,12 @@ tBTM_STATUS BTM_EnableTestMode(void) { 
                              HCI_FILTER_COND_NEW_DEVICE, &cond, sizeof(cond));



  /* put device to connectable mode */

  if (BTM_SetConnectability(BTM_CONNECTABLE, 0, 0) != BTM_SUCCESS) {

  if (BTM_SetConnectability(BTM_CONNECTABLE) != BTM_SUCCESS) {

    return BTM_NO_RESOURCES;

  }



  /* put device to discoverable mode */

  if (BTM_SetDiscoverability(BTM_GENERAL_DISCOVERABLE, 0, 0) != BTM_SUCCESS) {

  if (BTM_SetDiscoverability(BTM_GENERAL_DISCOVERABLE) != BTM_SUCCESS) {

    return BTM_NO_RESOURCES;

  }

system/stack/btm/btm_inq.cc

+12 −95
Original line number Diff line number Diff line
@@ -150,10 +150,9 @@ void SendRemoteNameRequest(const RawAddress& raw_address) { 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window,

                                   uint16_t interval) {

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_SetDiscoverability(inq_mode, window, interval);

    return bluetooth::shim::BTM_SetDiscoverability(inq_mode, 0, 0);

  }



  uint8_t scan_mode = 0;
@@ -164,6 +163,8 @@ tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window, 
  LAP temp_lap[2];

  bool is_limited;

  bool cod_limited;

  uint16_t window = BTM_DEFAULT_DISC_WINDOW;

  uint16_t interval = BTM_DEFAULT_DISC_INTERVAL;



  BTM_TRACE_API("BTM_SetDiscoverability");

  if (controller_get_interface()->supports_ble()) {
@@ -182,26 +183,8 @@ tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window, 
  if (!controller_get_interface()->get_is_ready()) return (BTM_DEV_RESET);



  /* If the window and/or interval is '0', set to default values */

  if (!window) window = BTM_DEFAULT_DISC_WINDOW;



  if (!interval) interval = BTM_DEFAULT_DISC_INTERVAL;



  BTM_TRACE_API(

      "BTM_SetDiscoverability: mode %d [NonDisc-0, Lim-1, Gen-2], window "

      "0x%04x, interval 0x%04x",

      inq_mode, window, interval);



  /*** Check for valid window and interval parameters ***/

  /*** Only check window and duration if mode is connectable ***/

  if (inq_mode != BTM_NON_DISCOVERABLE) {

    /* window must be less than or equal to interval */

    if (window < HCI_MIN_INQUIRYSCAN_WINDOW ||

        window > HCI_MAX_INQUIRYSCAN_WINDOW ||

        interval < HCI_MIN_INQUIRYSCAN_INTERVAL ||

        interval > HCI_MAX_INQUIRYSCAN_INTERVAL || window > interval) {

      return (BTM_ILLEGAL_VALUE);

    }

  }

  BTM_TRACE_API("BTM_SetDiscoverability: mode %d [NonDisc-0, Lim-1, Gen-2]",

                inq_mode);



  /* Set the IAC if needed */

  if (inq_mode != BTM_NON_DISCOVERABLE) {
@@ -324,33 +307,6 @@ tBTM_STATUS BTM_SetInquiryMode(uint8_t mode) { 
  return (BTM_SUCCESS);

}



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

 *

 * Function         BTM_ReadDiscoverability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 *

 * Output Params:   p_window - current inquiry scan duration

 *                  p_interval - current inquiry scan interval

 *

 * Returns          BTM_NON_DISCOVERABLE, BTM_LIMITED_DISCOVERABLE, or

 *                  BTM_GENERAL_DISCOVERABLE

 *

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

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_ReadDiscoverability(p_window, p_interval);

  }



  BTM_TRACE_API("BTM_ReadDiscoverability");

  if (p_window) *p_window = btm_cb.btm_inq_vars.inq_scan_window;



  if (p_interval) *p_interval = btm_cb.btm_inq_vars.inq_scan_period;



  return (btm_cb.btm_inq_vars.discoverable_mode);

}



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

 *

 * Function         BTM_SetConnectability
@@ -365,13 +321,14 @@ uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) { 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window,

                                  uint16_t interval) {

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_SetConnectability(page_mode, window, interval);

    return bluetooth::shim::BTM_SetConnectability(page_mode, 0, 0);

  }



  uint8_t scan_mode = 0;

  uint16_t window = BTM_DEFAULT_CONN_WINDOW;

  uint16_t interval = BTM_DEFAULT_CONN_INTERVAL;

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;



  BTM_TRACE_API("BTM_SetConnectability");
@@ -392,26 +349,11 @@ tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window, 
  /* Make sure the controller is active */

  if (!controller_get_interface()->get_is_ready()) return (BTM_DEV_RESET);



  /* If the window and/or interval is '0', set to default values */

  if (!window) window = BTM_DEFAULT_CONN_WINDOW;



  if (!interval) interval = BTM_DEFAULT_CONN_INTERVAL;

  BTM_TRACE_API("BTM_SetConnectability: mode %d [NonConn-0, Conn-1]",

                page_mode);



  BTM_TRACE_API(

      "BTM_SetConnectability: mode %d [NonConn-0, Conn-1], window 0x%04x, "

      "interval 0x%04x",

      page_mode, window, interval);



  /*** Check for valid window and interval parameters ***/

  /*** Only check window and duration if mode is connectable ***/

  if (page_mode == BTM_CONNECTABLE) {

    /* window must be less than or equal to interval */

    if (window < HCI_MIN_PAGESCAN_WINDOW || window > HCI_MAX_PAGESCAN_WINDOW ||

        interval < HCI_MIN_PAGESCAN_INTERVAL ||

        interval > HCI_MAX_PAGESCAN_INTERVAL || window > interval) {

      return (BTM_ILLEGAL_VALUE);

    }



    scan_mode |= HCI_PAGE_SCAN_ENABLED;

  }
@@ -432,31 +374,6 @@ tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window, 
  return (BTM_SUCCESS);

}



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

 *

 * Function         BTM_ReadConnectability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 * Output Params    p_window - current page scan duration

 *                  p_interval - current time between page scans

 *

 * Returns          BTM_NON_CONNECTABLE or BTM_CONNECTABLE

 *

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

uint16_t BTM_ReadConnectability(uint16_t* p_window, uint16_t* p_interval) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_ReadConnectability(p_window, p_interval);

  }



  BTM_TRACE_API("BTM_ReadConnectability");

  if (p_window) *p_window = btm_cb.btm_inq_vars.page_scan_window;



  if (p_interval) *p_interval = btm_cb.btm_inq_vars.page_scan_period;



  return (btm_cb.btm_inq_vars.connectable_mode);

}



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

 *

 * Function         BTM_IsInquiryActive