| commit | 9cbaddfea9250124a50c8d7e02985ba204627638 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 13 18:01:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 18:01:51 2021 +0000 |
| tree | 8111758a53d06cb0c092407983086aae9c19544d | |
| parent | 42710a544f23ddc5dcb0c770a96e03b84e96824a [diff] | |
| parent | adf74bc9156c3108f3a670fc37415f28e6121262 [diff] |
Merge "Stop inquiry when inquiry cancelled" into sc-dev am: adf74bc915 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15534527 Change-Id: Id185d89ce382234b4a4f8bdf504fc12d64b32a26
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc index 8bb416b..890cd3a 100644 --- a/stack/btm/btm_inq.cc +++ b/stack/btm/btm_inq.cc
@@ -534,8 +534,10 @@ 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);