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

Commit 724db4a1 authored by Omair Kamil's avatar Omair Kamil
Browse files

Ensure that LE scan for discovery runs for 12.8s, same as classic discovery. 

Also don't overwrite the previous scan parameters with low latency values, so that once discovery is complete scan parameters are reverted back to the original values.

Bug: 357894405
Bug: 357894242
Test: atest BumbleBluetoothTests
Change-Id: I8cf09aea7b465909887baf4da807b067b5a330bd
parent bf5389ff

system/stack/btm/btm_ble_gap.cc

+9 −4
Original line number Diff line number Diff line
@@ -1504,7 +1504,9 @@ 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:      duration - Duration of inquiry in seconds

 * Parameters:      duration - Duration of inquiry in seconds. With flag

 *                             le_inquiry_duration duration is a multiplier for

 *                             1.28 seconds.

 *

 * Returns          BTM_CMD_STARTED if successfully started

 *                  BTM_BUSY - if an inquiry is already active
@@ -1550,8 +1552,10 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { 
  } else if ((btm_cb.ble_ctr_cb.inq_var.scan_interval != scan_interval) ||

             (btm_cb.ble_ctr_cb.inq_var.scan_window != scan_window)) {

    log::verbose("restart LE scan with low latency scan params");

    if (!com::android::bluetooth::flags::le_inquiry_duration()) {

      btm_cb.ble_ctr_cb.inq_var.scan_interval = scan_interval;

      btm_cb.ble_ctr_cb.inq_var.scan_window = scan_window;

    }

    btm_send_hci_scan_enable(BTM_BLE_SCAN_DISABLE, BTM_BLE_DUPLICATE_ENABLE);

    btm_send_hci_set_scan_params(BTM_BLE_SCAN_MODE_ACTI, scan_interval, scan_window, scan_phy,

                                 btm_cb.ble_ctr_cb.addr_mgnt_cb.own_addr_type, SP_ADV_ALL);
@@ -1565,7 +1569,8 @@ tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) { 


  if (duration != 0) {

    /* start inquiry timer */

    uint64_t duration_ms = duration * 1000;

    uint64_t duration_ms =

            duration * (com::android::bluetooth::flags::le_inquiry_duration() ? 1280 : 1000);

    alarm_set_on_mloop(btm_cb.ble_ctr_cb.inq_var.inquiry_timer, duration_ms,

                       btm_ble_inquiry_timer_timeout, NULL);

  }