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

Commit 6bcadf6e authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Automerger Merge Worker
Browse files

Merge "floss: Inquiry timeout stops all modes" am: d3297862 

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



Change-Id: I384d27d175c02f50fc41bf88a58d45310481565b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31b78114 d3297862

system/stack/btm/btm_inq.cc

+4 −3
Original line number Original line Diff line number Diff line
@@ -532,7 +532,10 @@ void BTM_CancelInquiry(void) { 
}

}





static void btm_classic_inquiry_timeout(UNUSED_ATTR void* data) {

static void btm_classic_inquiry_timeout(UNUSED_ATTR void* data) {

  btm_process_inq_complete(HCI_SUCCESS, BTM_BR_INQUIRY_MASK);

  // We mark both classic inquiry and BLE inquiry complete so that we stop

  // processing BLE results as inquiry results.

  btm_process_inq_complete(HCI_SUCCESS,

                           (BTM_BR_INQUIRY_MASK | BTM_BLE_INQUIRY_MASK));

}

}





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

/*******************************************************************************
@@ -1408,8 +1411,6 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { 
  p_inq->inqparms.mode &= ~(mode);

  p_inq->inqparms.mode &= ~(mode);

  const auto inq_active = p_inq->inq_active;

  const auto inq_active = p_inq->inq_active;





  alarm_cancel(p_inq->classic_inquiry_timer);



#if (BTM_INQ_DEBUG == TRUE)

#if (BTM_INQ_DEBUG == TRUE)

  BTM_TRACE_DEBUG("btm_process_inq_complete inq_active:0x%x state:%d",

  BTM_TRACE_DEBUG("btm_process_inq_complete inq_active:0x%x state:%d",

                  btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

                  btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);