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

Commit 5a7d0331 authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

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

Merge "Ensure that LE scan for discovery runs for 12.8s, same as classic discovery." into main am: d7eab71e am: 666306bc

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



Change-Id: I300cf211e1bda1dde4cbcbcb64513d157a102d31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04ce6dba 666306bc

system/stack/btm/btm_ble_gap.cc

+9 −4
Original line number Diff line number Diff line
@@ -1514,7 +1514,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
@@ -1560,8 +1562,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);
@@ -1575,7 +1579,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);

  }