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

Commit 1dc25189 authored by Chris Manton's avatar Chris Manton
Browse files

stack::inq Remove never set BTM_SSP_INQUIRY_ACTIVE 

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

Change-Id: Idca95a736fb788441149441ce54a990d7856174e
parent 9db835b7

system/stack/btm/btm_inq.cc

+1 −14
Original line number Diff line number Diff line
@@ -748,17 +748,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  // with other scanners.

  BTM_StartLeScan();



  if (btm_cb.btm_inq_vars.inq_active & BTM_SSP_INQUIRY_ACTIVE) {

    log::info("Not starting inquiry as SSP is in progress");

    // Report the status here because inq_complete will cancel it below

    BTIF_dm_report_inquiry_status_change(

        tBTM_INQUIRY_STATE::BTM_INQUIRY_STARTED);



    btm_process_inq_complete(HCI_ERR_MAX_NUM_OF_CONNECTIONS,

                             BTM_GENERAL_INQUIRY);

    return BTM_CMD_STARTED;

  }



  btm_clr_inq_result_flt();



  btm_init_inq_result_flt();
@@ -1085,9 +1074,7 @@ void btm_inq_db_reset(void) { 
 * Returns          void

 *

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

void btm_inq_clear_ssp(void) {

  btm_cb.btm_inq_vars.inq_active &= ~BTM_SSP_INQUIRY_ACTIVE;

}

void btm_inq_clear_ssp(void) {}



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

 *

system/stack/btm/neighbor_inquiry.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ enum : uint8_t { 
  BTM_INQUIRY_NONE = 0,

  BTM_INQUIRY_INACTIVE = 0x0,

  BTM_GENERAL_INQUIRY = 0x01,

  /* SSP is active, so inquiry is disallowed (work around for FW bug) */

  BTM_SSP_INQUIRY_ACTIVE = 0x4,

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

  BTM_BLE_GENERAL_INQUIRY = 0x10,

  BTM_BR_INQUIRY_MASK = (BTM_GENERAL_INQUIRY),