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

Commit 6daf73ff authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

[3/7] stack::btm::inq BTM_BLE_INQ_ACTIVE_MASK => BTM_BLE_GENERAL_INQUIRY am: a06003c5 

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



Change-Id: Iabde5fb5712483072cd399c4a843cfaa43d7a9ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e4d01fc a06003c5

system/stack/acl/btm_pm.cc

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static bool btm_pm_device_in_active_or_sniff_mode(void) { 
bool BTM_PM_DeviceInScanState(void) {

  /* Check for inquiry */

  if ((btm_cb.btm_inq_vars.inq_active &

       (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK)) != 0) {

       (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_GENERAL_INQUIRY)) != 0) {

    log::verbose("BTM_PM_DeviceInScanState- Inq active");

    return true;

  }

system/stack/btm/neighbor_inquiry.h

+1 −3
Original line number Diff line number Diff line
@@ -72,10 +72,8 @@ enum : uint8_t { 
  BTM_GENERAL_INQUIRY_ACTIVE = BTM_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_BLE_GENERAL_INQUIRY),

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK = (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_INQ_ACTIVE_MASK),

  BTM_INQUIRY_ACTIVE_MASK = (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_GENERAL_INQUIRY),

};



/* Define scan types */