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

Commit 8d440733 authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix RNR Command Disallowed error in discovery classic only mode"... 

Merge "floss: Fix RNR Command Disallowed error in discovery classic only mode" am: dd4ea740 am: 325ff612

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



Change-Id: I6703032c1c8541c0b010eb700b011dd2c5ae34e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 642c2594 325ff612

system/stack/btm/btm_inq.cc

+5 −4
Original line number Diff line number Diff line
@@ -536,10 +536,11 @@ void BTM_CancelInquiry(void) { 
}



static void btm_classic_inquiry_timeout(UNUSED_ATTR void* data) {

  // 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));

  // When the Inquiry Complete event is received, the classic inquiry

  // will be marked as completed. Therefore, we only need to mark

  // the BLE inquiry as completed here to stop processing BLE results

  // as inquiry results.

  btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_INQUIRY_MASK);

}



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