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

Commit ac9160e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I53bf7520,Iee711ff3 into main 

* changes:
  system/btif: Fix -Wmissing-prototypes errors
  system/btif: Fix -Wmissing-prototypes errors
parents 9d2f0f2e 9369d1ca

system/bta/dm/bta_dm_act.cc

+0 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ using bluetooth::Uuid; 
using namespace bluetooth;



bool ble_vnd_is_included();

void BTIF_dm_disable();

void BTIF_dm_enable();

void btm_ble_scanner_init(void);



static void bta_dm_check_av();

system/btif/include/btif_acl.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "stack/include/acl_api_types.h"



void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE inquiry_state);

system/btif/include/btif_dm.h

+18 −6
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
 *

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



#ifndef BTIF_DM_H

#define BTIF_DM_H

#pragma once



#include "bta/include/bta_api.h"

#include "bta/include/bta_sec_api.h"
@@ -25,6 +24,7 @@ 
#include "hci/le_rand_callback.h"

#include "internal_include/bt_target.h"

#include "internal_include/bte_appl.h"

#include "stack/include/acl_api_types.h"

#include "types/raw_address.h"



/*******************************************************************************
@@ -97,13 +97,12 @@ bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c, Octet16* p_r) 
void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);



void btif_check_device_in_inquiry_db(const RawAddress& address);

bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type);

bool btif_get_device_type(const RawAddress& bda, int* p_device_type);



void btif_dm_clear_event_filter();



void btif_dm_clear_event_mask();



void btif_dm_clear_filter_accept_list();



void btif_dm_disconnect_all_acls();



void btif_dm_le_rand(bluetooth::hci::LeRandCallback callback);
@@ -121,6 +120,12 @@ void btif_dm_hh_open_failed(RawAddress* bdaddr); 
/*callout for reading SMP properties from Text file*/

bool btif_dm_get_smp_config(tBTE_APPL_CFG* p_cfg);



void btif_dm_enable_service(tBTA_SERVICE_ID service_id, bool enable);



void BTIF_dm_disable();

void BTIF_dm_enable();

void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE inquiry_state);



typedef struct {

  bool is_penc_key_rcvd;

  tBTM_LE_PENC_KEYS penc_key; /* received peer encryption key */
@@ -150,4 +155,11 @@ bool check_cod_hid(const RawAddress& bd_addr); 
bool check_cod_hid_major(const RawAddress& bd_addr, uint32_t cod);

bool is_device_le_audio_capable(const RawAddress bd_addr);

bool is_le_audio_capable_during_service_discovery(const RawAddress& bd_addr);

#endif
 


namespace bluetooth::legacy::testing {

void bta_energy_info_cb(tBTM_BLE_TX_TIME_MS tx_time, tBTM_BLE_RX_TIME_MS rx_time,

                        tBTM_BLE_IDLE_TIME_MS idle_time, tBTM_BLE_ENERGY_USED energy_used,

                        tBTM_CONTRL_STATE ctrl_state, tBTA_STATUS status);

void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, const BD_NAME bd_name,

                       bool during_device_search);

}  // namespace bluetooth::legacy::testing

system/btif/include/btif_hf_client.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2024 Google, LLC.

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

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



#pragma once



#include <hardware/bluetooth.h>

#include <hardware/bt_hf_client.h>



const bthf_client_interface_t* btif_hf_client_get_interface();

bt_status_t btif_hf_client_execute_service(bool b_enable);

system/btif/include/btif_sdp.h

+5 −1
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ 


#include <hardware/bt_sdp.h>



btsdp_interface_t* btif_sdp_get_interface();

const btsdp_interface_t* btif_sdp_get_interface();

bt_status_t btif_sdp_execute_service(bool b_enable);



bt_status_t sdp_server_init();

void sdp_server_cleanup();



#endif