commit 85ce5cf853b94c92476e96913f042ceb776f4403
author Chris Manton <cmanton@google.com> Wed Jun 12 17:06:53 2024 -0700
committer Chris Manton <cmanton@google.com> Sun Jun 16 03:23:35 2024 +0000
tree 45b8f591e67ee956aff95b5eda075cfa0be0df96
parent 77a3afc9b62f28ff0820419f1bf2aeae2cb86438

[6/7] stack::btm::inq BTM_BLE_INQUIRY_MASK => BTM_BLE_GENERAL_INQUIRY

Bug: 345484372
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Ifa81c2633f1118f26c859687b2925513923e8d76

system/stack/btm/btm_ble_gap.cc

diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index 81315a0..08cfc82 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -2491,7 +2491,7 @@
   // TODO: remove this call and make btm_process_inq_complete static
   btm_process_inq_complete(
       HCI_SUCCESS,
-      (uint8_t)(btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK));
+      (uint8_t)(btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_GENERAL_INQUIRY));
 }
 
 /*******************************************************************************

system/stack/btm/btm_inq.cc

diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index cbf4906..3060b4f 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -527,7 +527,7 @@
 static void BTM_CancelLeScan() {
   if (!bluetooth::shim::is_classic_discovery_only_enabled()) {
     log::assert_that(BTM_IsDeviceUp(), "assert failed: BTM_IsDeviceUp()");
-    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)
+    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BLE_GENERAL_INQUIRY) != 0)
       btm_ble_stop_inquiry();
   } else {
     log::info(
@@ -607,7 +607,7 @@
   // 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);
+  btm_process_inq_complete(HCI_SUCCESS, BTM_BLE_GENERAL_INQUIRY);
 }
 
 /*******************************************************************************
@@ -630,7 +630,7 @@
       return BTM_CMD_STARTED;
     } else {
       log::warn("Trying to do LE scan on a non-LE adapter");
-      btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;
+      btm_cb.btm_inq_vars.inqparms.mode &= ~BTM_BLE_GENERAL_INQUIRY;
     }
   } else {
     log::info(

system/stack/btm/neighbor_inquiry.h

diff --git a/system/stack/btm/neighbor_inquiry.h b/system/stack/btm/neighbor_inquiry.h
index 428958d..a3984cc 100644
--- a/system/stack/btm/neighbor_inquiry.h
+++ b/system/stack/btm/neighbor_inquiry.h
@@ -68,7 +68,6 @@
   /* high nibble of inquiry mode for BLE inquiry mode */
   BTM_BLE_GENERAL_INQUIRY = 0x10,
   BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),
-  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),
   /* inquiry activity mask */
   BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY),
 };