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

Commit 0f26fde8 authored by Myles Watson's avatar Myles Watson
Browse files

Remove btm_acl_update_inquiry_status 

It has nothing to do with ACL.

Bug: 322230000
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I979b3b2d529b3a59687fd34e35b3f76dd1191a8c
parent 80973bc2

system/stack/acl/btm_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 


#include "bta/include/bta_dm_acl.h"

#include "bta/sys/bta_sys.h"

#include "btif/include/btif_acl.h"

#include "common/init_flags.h"

#include "common/metrics.h"

#include "device/include/controller.h"
@@ -528,10 +527,6 @@ void btm_acl_device_down(void) { 
  BTM_db_reset();

}



void btm_acl_update_inquiry_status(uint8_t status) {

  BTIF_dm_report_inquiry_status_change(status);

}



tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) {

  if (p_role == nullptr) {

    return BTM_ILLEGAL_VALUE;

system/stack/btm/btm_inq.cc

+4 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <mutex>



#include "advertise_data_parser.h"

#include "btif/include/btif_acl.h"

#include "btif/include/btif_config.h"

#include "common/time_util.h"

#include "device/include/controller.h"
@@ -49,7 +50,6 @@ 
#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_api_types.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_lap.h"
@@ -673,7 +673,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
    }

  }



  btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);

  BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_STARTED);



  if (btm_cb.btm_inq_vars.inq_active & BTM_SSP_INQUIRY_ACTIVE) {

    LOG_INFO("Not starting inquiry as SSP is in progress");
@@ -1475,7 +1475,7 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { 
  btm_cb.btm_inq_vars.inqparms.mode &= ~(mode);

  const auto inq_active = btm_cb.btm_inq_vars.inq_active;



  btm_acl_update_inquiry_status(BTM_INQUIRY_COMPLETE);

  BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_COMPLETE);



  if (status != HCI_SUCCESS) {

    LOG_WARN("Received unexpected hci status:%s",
@@ -1569,7 +1569,7 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { 
 *

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

void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode) {

  btm_acl_update_inquiry_status(BTM_INQUIRY_CANCELLED);

  BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_CANCELLED);

  btm_process_inq_complete(status, mode);

}

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

system/stack/include/acl_api.h

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ bool btm_is_acl_locally_initiated(void); 
tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport);



void btm_acl_device_down(void);

void btm_acl_update_inquiry_status(uint8_t status);



void ACL_RegisterClient(struct acl_client_callback_s* callbacks);

void ACL_UnregisterClient(struct acl_client_callback_s* callbacks);

system/test/mock/mock_stack_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct btm_acl_process_sca_cmpl_pkt btm_acl_process_sca_cmpl_pkt; 
struct btm_acl_removed btm_acl_removed;

struct btm_acl_role_changed btm_acl_role_changed;

struct btm_acl_update_conn_addr btm_acl_update_conn_addr;

struct btm_acl_update_inquiry_status btm_acl_update_inquiry_status;

struct btm_ble_refresh_local_resolvable_private_addr

    btm_ble_refresh_local_resolvable_private_addr;

struct btm_cont_rswitch_from_handle btm_cont_rswitch_from_handle;
@@ -518,10 +517,6 @@ void btm_acl_update_conn_addr(uint16_t handle, const RawAddress& address) { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::btm_acl_update_conn_addr(handle, address);

}

void btm_acl_update_inquiry_status(uint8_t status) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::btm_acl_update_inquiry_status(status);

}

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_acl.h

+0 −8
Original line number Diff line number Diff line
@@ -889,14 +889,6 @@ struct btm_acl_update_conn_addr { 
  };

};

extern struct btm_acl_update_conn_addr btm_acl_update_conn_addr;

// Name: btm_acl_update_inquiry_status

// Params: uint8_t status

// Returns: void

struct btm_acl_update_inquiry_status {

  std::function<void(uint8_t status)> body{[](uint8_t /* status */) { ; }};

  void operator()(uint8_t status) { body(status); };

};

extern struct btm_acl_update_inquiry_status btm_acl_update_inquiry_status;

// Name: btm_ble_refresh_local_resolvable_private_addr

// Params:  const RawAddress& pseudo_addr, const RawAddress& local_rpa

// Returns: void