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

Commit 97b861f2 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

[4/7] stack::btm::inq BTM_BR_INQ_ACTIVE_MASK => BTM_GENERAL_INQUIRY_ACTIVE am:... 

[4/7] stack::btm::inq BTM_BR_INQ_ACTIVE_MASK => BTM_GENERAL_INQUIRY_ACTIVE am: 4f723b9c am: 4a332f70

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



Change-Id: I54f6cee8385b721d13e4add819eeed5f5e972a3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72b67599 4a332f70

system/stack/acl/btm_pm.cc

+1 −1
Original line number Original line 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) {

bool BTM_PM_DeviceInScanState(void) {

  /* Check for inquiry */

  /* Check for inquiry */

  if ((btm_cb.btm_inq_vars.inq_active &

  if ((btm_cb.btm_inq_vars.inq_active &

       (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_GENERAL_INQUIRY)) != 0) {

       (BTM_GENERAL_INQUIRY_ACTIVE | BTM_BLE_GENERAL_INQUIRY)) != 0) {

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

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

    return true;

    return true;

  }

  }

system/stack/btm/btm_inq.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -1288,7 +1288,7 @@ static void btm_process_inq_results_standard(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_BR_INQ_ACTIVE_MASK)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }
@@ -1409,7 +1409,7 @@ static void btm_process_inq_results_rssi(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_BR_INQ_ACTIVE_MASK)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }
@@ -1553,7 +1553,7 @@ static void btm_process_inq_results_extended(bluetooth::hci::EventView event) { 
             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

             btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);





  /* Only process the results if the BR inquiry is still active */

  /* Only process the results if the BR inquiry is still active */

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_BR_INQ_ACTIVE_MASK)) {

  if (!(btm_cb.btm_inq_vars.inq_active & BTM_GENERAL_INQUIRY_ACTIVE)) {

    log::info("Inquiry is inactive so dropping inquiry result");

    log::info("Inquiry is inactive so dropping inquiry result");

    return;

    return;

  }

  }

system/stack/btm/neighbor_inquiry.h

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

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_BLE_INQUIRY_MASK = (BTM_BLE_GENERAL_INQUIRY),

  BTM_GENERAL_INQUIRY_ACTIVE = BTM_GENERAL_INQUIRY,

  BTM_GENERAL_INQUIRY_ACTIVE = BTM_GENERAL_INQUIRY,

  /* BR/EDR inquiry activity mask */

  BTM_BR_INQ_ACTIVE_MASK = (BTM_GENERAL_INQUIRY_ACTIVE),

  /* inquiry activity mask */

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK = (BTM_BR_INQ_ACTIVE_MASK | BTM_BLE_GENERAL_INQUIRY),

  BTM_INQUIRY_ACTIVE_MASK =

      (BTM_GENERAL_INQUIRY_ACTIVE | BTM_BLE_GENERAL_INQUIRY),

};

};





/* Define scan types */

/* Define scan types */