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

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

Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry am:... 

Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry am: 55a866a7 am: 521ec7c3 am: c578583f

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

Change-Id: I2d3432b734b8275cb685610d38b8b1ec08b8deb0
parents 8c753c3d c578583f

system/stack/btm/btm_ble_gap.cc

+5 −5
Original line number Diff line number Diff line
@@ -1140,13 +1140,13 @@ void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, 
 *                  BTM_BUSY - if an inquiry is already active

 *

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

tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration) {

tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) {

  tBTM_STATUS status = BTM_CMD_STARTED;

  tBTM_BLE_CB* p_ble_cb = &btm_cb.ble_ctr_cb;

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;



  BTM_TRACE_DEBUG("btm_ble_start_inquiry: mode = %02x inq_active = 0x%02x",

                  mode, btm_cb.btm_inq_vars.inq_active);

  BTM_TRACE_DEBUG("btm_ble_start_inquiry: inq_active = 0x%02x",

                  btm_cb.btm_inq_vars.inq_active);



  /* if selective connection is active, or inquiry is already active, reject it

   */
@@ -1180,8 +1180,8 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration) { 
  }



  if (status == BTM_CMD_STARTED) {

    p_inq->inq_active |= mode;

    p_ble_cb->scan_activity |= mode;

    p_inq->inq_active |= BTM_BLE_GENERAL_INQUIRY;

    p_ble_cb->scan_activity |= BTM_BLE_GENERAL_INQUIRY;



    BTM_TRACE_DEBUG("btm_ble_start_inquiry inq_active = 0x%02x",

                    p_inq->inq_active);

system/stack/btm/btm_ble_int.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int, 
                                         uint16_t scan_win,

                                         uint8_t addr_type_own,

                                         uint8_t scan_filter_policy);

extern tBTM_STATUS btm_ble_start_inquiry(uint8_t mode, uint8_t duration);

extern tBTM_STATUS btm_ble_start_inquiry(uint8_t duration);

extern void btm_ble_stop_scan(void);

extern void btm_clear_all_pending_le_entry(void);

system/stack/btm/btm_inq.cc

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
                  p_inq->inq_active);



  if (controller_get_interface()->supports_ble()) {

    btm_ble_start_inquiry(BTM_BLE_GENERAL_INQUIRY, p_inq->inqparms.duration);

    btm_ble_start_inquiry(p_inq->inqparms.duration);

  }

  p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;