aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-08-13 17:50:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-13 17:50:37 +0000
commitadf74bc9156c3108f3a670fc37415f28e6121262 (patch)
tree8111758a53d06cb0c092407983086aae9c19544d
parent7f79977fcf102eb2e42ff0ebfb98d62b0f7995ef (diff)
parentd559977329e20773f677bbdc5f3e85b54d1b4ff3 (diff)
downloadbt-adf74bc9156c3108f3a670fc37415f28e6121262.tar.gz
Merge "Stop inquiry when inquiry cancelled" into sc-dev
-rw-r--r--stack/btm/btm_inq.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 8bb416b7b..890cd3a0d 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -534,8 +534,10 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,
if (controller_get_interface()->supports_ble()) {
btm_ble_start_inquiry(p_inq->inqparms.duration);
+ } else {
+ LOG_WARN("Trying to do LE scan on a non-LE adapter");
+ p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
}
- p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);