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

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

Merge "stack::btm::ble Remove unused status btm_ble_start_inquiry" am: 922ef1db 

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



Change-Id: Iee1bc4a2f0ecf9881bd82302afd40d64d71c3e1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9038696f 922ef1db

system/stack/btm/btm_ble_gap.cc

+11 −21
Original line number Diff line number Diff line
@@ -1978,21 +1978,13 @@ static void btm_ble_scan_filt_param_cfg_evt(uint8_t avbl_space, 
 *                  If the duration is zero, the periodic inquiry mode is

 *                  cancelled.

 *

 * Parameters:      mode - GENERAL or LIMITED inquiry

 *                  p_inq_params - pointer to the BLE inquiry parameter.

 *                  p_results_cb - callback returning pointer to results

 *                                 (tBTM_INQ_RESULTS)

 *                  p_cmpl_cb - callback indicating the end of an inquiry

 *

 *

 * Parameters:      duration - Duration of inquiry in seconds

 *

 * Returns          BTM_CMD_STARTED if successfully started

 *                  BTM_NO_RESOURCES if could not allocate a message buffer

 *                  BTM_BUSY - if an inquiry is already active

 *

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

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;
@@ -2045,7 +2037,6 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { 
    btm_send_hci_scan_enable(BTM_BLE_SCAN_ENABLE, BTM_BLE_DUPLICATE_DISABLE);

  }



  if (status == BTM_CMD_STARTED) {

  p_inq->inq_active |= BTM_BLE_GENERAL_INQUIRY;

  p_ble_cb->set_ble_inquiry_active();
@@ -2058,9 +2049,8 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { 
    alarm_set_on_mloop(p_ble_cb->inq_var.inquiry_timer, duration_ms,

                       btm_ble_inquiry_timer_timeout, NULL);

  }

  }



  return status;

  return BTM_CMD_STARTED;

}



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