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

Commit c3b84f3b authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Remove unused btm_read_remote_features_complete" into main am: 766108fa 

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



Change-Id: I0d6a54d1c952b16c9609e76b47380a108b30fab2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2d3c0ce 766108fa

system/stack/acl/btm_acl.cc

+0 −38
Original line number Diff line number Diff line
@@ -958,44 +958,6 @@ void btm_read_remote_ext_features(uint16_t handle, uint8_t page_number) { 
  btsnd_hcic_rmt_ext_features(handle, page_number);

}



void btm_read_remote_features_complete(uint16_t handle, uint8_t* features) {

  tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle);

  if (p_acl_cb == nullptr) {

    LOG_WARN("Unable to find active acl");

    return;

  }



  /* Copy the received features page */

  STREAM_TO_ARRAY(p_acl_cb->peer_lmp_feature_pages[0], features,

                  HCI_FEATURE_BYTES_PER_PAGE);

  p_acl_cb->peer_lmp_feature_valid[0] = true;



  /* save remote supported features to iot conf file */

  std::string key = IOT_CONF_KEY_RT_SUPP_FEATURES "_" + std::to_string(0);



  DEVICE_IOT_CONFIG_ADDR_SET_BIN(p_acl_cb->remote_addr, key,

                                 p_acl_cb->peer_lmp_feature_pages[0],

                                 BD_FEATURES_LEN);



  if ((HCI_LMP_EXTENDED_SUPPORTED(p_acl_cb->peer_lmp_feature_pages[0])) &&

      (controller_get_interface()

           ->supports_reading_remote_extended_features())) {

    /* if the remote controller has extended features and local controller

       supports HCI_Read_Remote_Extended_Features command then start reading

       these feature starting with extended features page 1 */

    LOG_DEBUG("Start reading remote extended features");

    btm_read_remote_ext_features(handle, 1);

    return;

  }



  /* Remote controller has no extended features. Process remote controller

     supported features (features page 0). */

  btm_process_remote_ext_features(p_acl_cb, 0);



  /* Continue with HCI connection establishment */

  internal_.btm_establish_continue(p_acl_cb);

}



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

 *

 * Function         btm_read_remote_ext_features_complete

system/stack/include/acl_hci_link_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ void btm_read_remote_ext_features_complete_raw(uint8_t* p, uint8_t evt_len); 
void btm_read_remote_ext_features_complete(uint16_t handle, uint8_t page_num,

                                           uint8_t max_page, uint8_t* features);

void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle);

void btm_read_remote_features_complete(uint16_t handle, uint8_t* features);

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

system/test/mock/mock_stack_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct btm_read_remote_ext_features_complete 
struct btm_read_remote_ext_features_complete_raw

    btm_read_remote_ext_features_complete_raw;

struct btm_read_remote_ext_features_failed btm_read_remote_ext_features_failed;

struct btm_read_remote_features_complete btm_read_remote_features_complete;

struct btm_read_remote_version_complete btm_read_remote_version_complete;

struct btm_read_rssi_complete btm_read_rssi_complete;

struct btm_read_rssi_timeout btm_read_rssi_timeout;
@@ -638,10 +637,6 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::btm_read_remote_ext_features_failed(status, handle);

}

void btm_read_remote_features_complete(uint16_t handle, uint8_t* features) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::btm_read_remote_features_complete(handle, features);

}

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

system/test/mock/mock_stack_acl.h

+0 −12
Original line number Diff line number Diff line
@@ -1136,18 +1136,6 @@ struct btm_read_remote_ext_features_failed { 
};

extern struct btm_read_remote_ext_features_failed

    btm_read_remote_ext_features_failed;

// Name: btm_read_remote_features_complete

// Params: uint16_t handle, uint8_t* features

// Returns: void

struct btm_read_remote_features_complete {

  std::function<void(uint16_t handle, uint8_t* features)> body{

      [](uint16_t handle, uint8_t* features) { ; }};

  void operator()(uint16_t handle, uint8_t* features) {

    body(handle, features);

  };

};

extern struct btm_read_remote_features_complete

    btm_read_remote_features_complete;

// Name: btm_read_remote_version_complete

// Params: tHCI_STATUS status, uint16_t handle, uint8_t lmp_version, uint16_t

// manufacturer, uint16_t lmp_subversion Returns: void