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

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

[7/7] stack::btm::inq BTM_BR_INQUIRY_MASK => BTM_GENERAL_INQUIRY am: 3286fb24 am: 76df9596 

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



Change-Id: I015af6fd5f82d75133382cfe872bc7920317565a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9061ff3b 76df9596

system/stack/btm/btm_inq.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -585,14 +585,14 @@ void BTM_CancelInquiry(void) { 
        NULL;                                 /* Do not notify caller anymore */

        NULL;                                 /* Do not notify caller anymore */

    btm_cb.btm_inq_vars.p_inq_cmpl_cb = NULL; /* Do not notify caller anymore */

    btm_cb.btm_inq_vars.p_inq_cmpl_cb = NULL; /* Do not notify caller anymore */





    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_BR_INQUIRY_MASK) != 0) {

    if ((btm_cb.btm_inq_vars.inqparms.mode & BTM_GENERAL_INQUIRY) != 0) {

      bluetooth::shim::GetHciLayer()->EnqueueCommand(

      bluetooth::shim::GetHciLayer()->EnqueueCommand(

          bluetooth::hci::InquiryCancelBuilder::Create(),

          bluetooth::hci::InquiryCancelBuilder::Create(),

          get_main_thread()->BindOnce(

          get_main_thread()->BindOnce(

              [](bluetooth::hci::CommandCompleteView complete_view) {

              [](bluetooth::hci::CommandCompleteView complete_view) {

                bluetooth::hci::check_complete<

                bluetooth::hci::check_complete<

                    bluetooth::hci::InquiryCancelCompleteView>(complete_view);

                    bluetooth::hci::InquiryCancelCompleteView>(complete_view);

                btm_process_cancel_complete(HCI_SUCCESS, BTM_BR_INQUIRY_MASK);

                btm_process_cancel_complete(HCI_SUCCESS, BTM_GENERAL_INQUIRY);

              }));

              }));

    }

    }

    BTM_CancelLeScan();

    BTM_CancelLeScan();
@@ -2432,7 +2432,7 @@ static void on_inquiry_complete(bluetooth::hci::EventView event) { 
  log::assert_that(complete.IsValid(), "assert failed: complete.IsValid()");

  log::assert_that(complete.IsValid(), "assert failed: complete.IsValid()");

  auto status = to_hci_status_code(static_cast<uint8_t>(complete.GetStatus()));

  auto status = to_hci_status_code(static_cast<uint8_t>(complete.GetStatus()));





  btm_process_inq_complete(status, BTM_BR_INQUIRY_MASK);

  btm_process_inq_complete(status, BTM_GENERAL_INQUIRY);

}

}

/*******************************************************************************

/*******************************************************************************

 *

 *

system/stack/btm/neighbor_inquiry.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ enum : uint8_t { 
  BTM_GENERAL_INQUIRY = 0x01,

  BTM_GENERAL_INQUIRY = 0x01,

  /* high nibble of inquiry mode for BLE inquiry mode */

  /* high nibble of inquiry mode for BLE inquiry mode */

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),

  /* inquiry activity mask */

  /* inquiry activity mask */

  BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY),

  BTM_INQUIRY_ACTIVE_MASK = (BTM_GENERAL_INQUIRY | BTM_BLE_GENERAL_INQUIRY),

};

};