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

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

Internalize btm_acl_device_down::BTM_db_reset am: 38e1fb15 am: a09fbf33 am: 995cf219 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1545358

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52d2d0c33d9d538e57f2701895a6fec838d40896
parents f279af42 995cf219

system/btif/src/stack_manager.cc

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ static void event_start_up_stack(UNUSED_ATTR void* context) { 


  bta_set_forward_hw_failures(true);

  btm_acl_device_down();

  BTM_db_reset();

  if (bluetooth::shim::is_gd_controller_enabled()) {

    CHECK(module_start_up(get_module(GD_CONTROLLER_MODULE)));

  } else {

system/main/shim/btm_api.h

+0 −2
Original line number Diff line number Diff line
@@ -828,8 +828,6 @@ void BTM_BleEnableDisableFilterFeature(uint8_t enable, 
 ******************************************************************************/

uint8_t BTM_BleMaxMultiAdvInstanceCount();



void BTM_db_reset(void);



void BTM_reset_complete();



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

system/stack/acl/btm_acl.cc

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ void gatt_find_in_device_record(const RawAddress& bd_addr, 
void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,

                            const RawAddress& p_bda);



void BTM_db_reset(void);



extern tBTM_CB btm_cb;



struct StackAclBtmAcl {
@@ -485,6 +487,7 @@ void btm_acl_device_down(void) { 
      l2c_link_hci_disc_comp(p->hci_handle, HCI_ERR_HW_FAILURE);

    }

  }

  BTM_db_reset();

}



void btm_acl_set_paging(bool value) { btm_cb.is_paging = value; }

system/stack/btm/btm_client_interface.cc

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct btm_client_interface_s btm_client_interface = { 
            .btm_free = btm_free,

            .btm_ble_init = btm_ble_init,

            .btm_ble_free = btm_ble_free,

            .BTM_db_reset = BTM_db_reset,

            .BTM_reset_complete = BTM_reset_complete,

        },

system/stack/include/btm_api.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ void btm_free(); 
 *  DEVICE CONTROL and COMMON FUNCTIONS

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



void BTM_db_reset(void);



void BTM_reset_complete();



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