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

Commit b2bbe335 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I1a554f37,I17a936ab,Ie74f6907 into main 

* changes:
  Remove unused parsing for periodic advertising
  Remove btm_ble_advertiser_hci_interface
  Remove unused btm_le_on_advertising_set_terminated
parents 669e9600 368c0284

system/bta/le_audio/broadcaster/mock_ble_advertising_manager.cc

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <base/memory/weak_ptr.h>



#include "ble_advertiser_hci_interface.h"

#include "main/shim/le_advertising_manager.h"



namespace {

system/stack/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ cc_library_static { 
        "acl/btm_ble_connection_establishment.cc",

        "acl/btm_pm.cc",

        "arbiter/acl_arbiter.cc",

        "btm/ble_advertiser_hci_interface.cc",

        "btm/ble_scanner_hci_interface.cc",

        "btm/btm_ble.cc",

        "btm/btm_ble_addr.cc",
@@ -1490,7 +1489,6 @@ cc_test { 
        "acl/btm_acl.cc",

        "acl/btm_ble_connection_establishment.cc",

        "acl/btm_pm.cc",

        "btm/ble_advertiser_hci_interface.cc",

        "btm/ble_scanner_hci_interface.cc",

        "btm/btm_ble.cc",

        "btm/btm_ble_addr.cc",

system/stack/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ source_set("stack") { 
    "bnep/bnep_api.cc",

    "bnep/bnep_main.cc",

    "bnep/bnep_utils.cc",

    "btm/ble_advertiser_hci_interface.cc",

    "btm/ble_scanner_hci_interface.cc",

    "btm/btm_ble.cc",

    "btm/btm_ble_addr.cc",

system/stack/acl/ble_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 


extern tBTM_CB btm_cb;



void btm_ble_advertiser_notify_terminated_legacy(uint8_t status,

                                                 uint16_t connection_handle);

void btm_ble_increment_link_topology_mask(uint8_t link_role);



static bool acl_ble_common_connection(
@@ -92,9 +90,6 @@ void acl_ble_enhanced_connection_complete( 
    btm_ble_refresh_peer_resolvable_private_addr(address_with_type.bda,

                                                 peer_rpa, BTM_BLE_ADDR_RRA);

  btm_ble_update_mode_operation(role, &address_with_type.bda, HCI_SUCCESS);



  if (role == HCI_ROLE_PERIPHERAL)

    btm_ble_advertiser_notify_terminated_legacy(HCI_SUCCESS, handle);

}



static bool maybe_resolve_received_address(

system/stack/acl/btm_ble_connection_establishment.cc

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 


extern tBTM_CB btm_cb;



void btm_ble_advertiser_notify_terminated_legacy(uint8_t status,

                                                 uint16_t connection_handle);



/** LE connection complete. */

void btm_ble_create_ll_conn_complete(tHCI_STATUS status) {

  if (status == HCI_SUCCESS) return;