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

Commit 647b9cdd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[2/7] stack::btm::inq Remove BTM_LE_GENERAL_INQUIRY_ACTIVE" into main... 

Merge "[2/7] stack::btm::inq Remove BTM_LE_GENERAL_INQUIRY_ACTIVE" into main am: 9fdadab6 am: 58370bf9

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



Change-Id: Idb99b344b7d073d43dfb950c16c5c17907697ba8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40842cc6 58370bf9

system/stack/btm/neighbor_inquiry.h

+1 −3
Original line number Diff line number Diff line
@@ -70,12 +70,10 @@ enum : uint8_t { 
  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_GENERAL_INQUIRY_ACTIVE = BTM_GENERAL_INQUIRY,

  /* a general inquiry is in progress */

  BTM_LE_GENERAL_INQUIRY_ACTIVE = BTM_BLE_GENERAL_INQUIRY,

  /* BR/EDR inquiry activity mask */

  BTM_BR_INQ_ACTIVE_MASK = (BTM_GENERAL_INQUIRY_ACTIVE),

  /* LE inquiry activity mask*/

  BTM_BLE_INQ_ACTIVE_MASK = (BTM_LE_GENERAL_INQUIRY_ACTIVE),

  BTM_BLE_INQ_ACTIVE_MASK = (BTM_BLE_GENERAL_INQUIRY),

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK = (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK),

};