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

Commit b27e8627 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Cleanup le scan parameters - continuation 

Get rid of last direct reference to scan params.

Flag: EXEMPT, minor cleanup, no logical change
Test: m com.android.btservices
Bug: 323055641
Change-Id: I9aa102ec587a274a90251242f387bc9466a41ed7
parent 94eb812f

system/stack/btm/btm_ble_gap.cc

+6 −4
Original line number Diff line number Diff line
@@ -533,8 +533,11 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, 
                             : btm_cb.ble_ctr_cb.inq_var.scan_window;



  // use low latency scanning if the scanning is active

  uint16_t ll_scan_interval, ll_scan_window;

  std::tie(ll_scan_interval, ll_scan_window) = get_low_latency_scan_params();

  if (low_latency_scan) {

    std::tie(scan_interval, scan_window) = get_low_latency_scan_params();

    std::tie(scan_interval, scan_window) =

        std::tie(ll_scan_interval, ll_scan_window);

  }



  log::verbose("scan_type:{}, {}, {}", btm_cb.ble_ctr_cb.inq_var.scan_type,
@@ -565,9 +568,8 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, 
       * 2. current ongoing scanning is low latency

       */

      bool is_ongoing_low_latency =

          btm_cb.ble_ctr_cb.inq_var.scan_interval ==

              BTM_BLE_GAP_DISC_SCAN_INT &&

          btm_cb.ble_ctr_cb.inq_var.scan_window == BTM_BLE_LOW_LATENCY_SCAN_WIN;

          btm_cb.ble_ctr_cb.inq_var.scan_interval == ll_scan_interval &&

          btm_cb.ble_ctr_cb.inq_var.scan_window == ll_scan_window;

      if (!low_latency_scan || is_ongoing_low_latency) {

        log::warn("Observer was already active, is_low_latency: {}",

                  is_ongoing_low_latency);