summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/app/Android.bp2
-rw-r--r--system/bta/dm/bta_dm_act.cc22
-rw-r--r--system/bta/le_audio/client_audio.cc5
-rw-r--r--system/stack/btm/btm_ble.cc2
-rw-r--r--system/stack/btm/btm_ble_int.h2
-rw-r--r--system/stack/btm/btm_iso_impl.h1
-rw-r--r--system/stack/include/btm_iso_api_types.h1
-rw-r--r--system/stack/include/smp_api_types.h11
8 files changed, 26 insertions, 20 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp
index b4e5ec9814..699b924cf6 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -117,7 +117,7 @@ android_app {
],
// Add in path to Bluetooth directory because local path does not exist
- javacflags: ["-Aroom.schemaLocation=packages/apps/Bluetooth/tests/unit/src/com/android/bluetooth/btservice/storage/schemas"],
+ javacflags: ["-Aroom.schemaLocation=packages/modules/Bluetooth/android/app/tests/unit/src/com/android/bluetooth/btservice/storage/schemas"],
optimize: {
enabled: false,
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 6ee4385022..67ea3c2dba 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -74,19 +74,21 @@ static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,
uint16_t eir_len);
static void bta_dm_inq_cmpl_cb(void* p_result);
static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,
- DEV_CLASS dc, BD_NAME bd_name);
+ DEV_CLASS dc,
+ tBTM_BD_NAME bd_name);
static void bta_dm_remname_cback(void* p);
static void bta_dm_find_services(const RawAddress& bd_addr);
static void bta_dm_discover_next_device(void);
static void bta_dm_sdp_callback(tSDP_STATUS sdp_status);
static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,
- const BD_NAME bd_name, bool min_16_digit);
+ const tBTM_BD_NAME bd_name, bool min_16_digit);
static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
- DEV_CLASS dev_class, BD_NAME bd_name,
+ DEV_CLASS dev_class,
+ tBTM_BD_NAME bd_name,
const LinkKey& key, uint8_t key_type);
static void bta_dm_authentication_complete_cback(const RawAddress& bd_addr,
DEV_CLASS dev_class,
- BD_NAME bd_name,
+ tBTM_BD_NAME bd_name,
tHCI_REASON result);
static void bta_dm_local_name_cback(void* p_name);
static void bta_dm_check_av();
@@ -1876,7 +1878,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result) {
******************************************************************************/
static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,
UNUSED_ATTR DEV_CLASS dc,
- BD_NAME bd_name) {
+ tBTM_BD_NAME bd_name) {
tBTM_REMOTE_DEV_NAME rem_name;
tBTM_STATUS btm_status;
@@ -2027,7 +2029,7 @@ static void bta_dm_pinname_cback(void* p_data) {
*
******************************************************************************/
static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,
- const BD_NAME bd_name, bool min_16_digit) {
+ const tBTM_BD_NAME bd_name, bool min_16_digit) {
if (!bta_dm_cb.p_sec_cback) return BTM_NOT_AUTHORIZED;
/* If the device name is not known, save bdaddr and devclass and initiate a
@@ -2066,8 +2068,8 @@ static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,
******************************************************************************/
static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
UNUSED_ATTR DEV_CLASS dev_class,
- BD_NAME bd_name, const LinkKey& key,
- uint8_t key_type) {
+ tBTM_BD_NAME bd_name,
+ const LinkKey& key, uint8_t key_type) {
tBTA_DM_SEC sec_event;
tBTA_DM_AUTH_CMPL* p_auth_cmpl;
tBTA_DM_SEC_EVT event = BTA_DM_AUTH_CMPL_EVT;
@@ -2111,8 +2113,8 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
*
******************************************************************************/
static void bta_dm_authentication_complete_cback(
- const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class, BD_NAME bd_name,
- tHCI_REASON reason) {
+ const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class,
+ tBTM_BD_NAME bd_name, tHCI_REASON reason) {
if (reason != HCI_SUCCESS) {
if (bta_dm_cb.p_sec_cback) {
// Build out the security event data structure
diff --git a/system/bta/le_audio/client_audio.cc b/system/bta/le_audio/client_audio.cc
index 1e69c85ce2..7154a709c9 100644
--- a/system/bta/le_audio/client_audio.cc
+++ b/system/bta/le_audio/client_audio.cc
@@ -315,12 +315,13 @@ void LeAudioClientAudioSource::Stop() {
sinkClientInterface->StopSession();
le_audio_sink_hal_state = HAL_STOPPED;
- std::lock_guard<std::mutex> guard(sinkInterfaceMutex);
- localAudioSinkReceiver = nullptr;
if (CodecManager::GetInstance()->GetCodecLocation() == CodecLocation::HOST) {
stop_audio_ticks();
}
+
+ std::lock_guard<std::mutex> guard(sinkInterfaceMutex);
+ localAudioSinkReceiver = nullptr;
}
const void* LeAudioClientAudioSource::Acquire() {
diff --git a/system/stack/btm/btm_ble.cc b/system/stack/btm/btm_ble.cc
index 01225ef867..6a36ce23bd 100644
--- a/system/stack/btm/btm_ble.cc
+++ b/system/stack/btm/btm_ble.cc
@@ -1737,7 +1737,7 @@ void btm_ble_connected_from_address_with_type(
*
*****************************************************************************/
tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,
- tSMP_EVT_DATA* p_data) {
+ const tSMP_EVT_DATA* p_data) {
tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
tBTM_STATUS res = BTM_SUCCESS;
diff --git a/system/stack/btm/btm_ble_int.h b/system/stack/btm/btm_ble_int.h
index 7a3b1efba3..8c3f786ac2 100644
--- a/system/stack/btm/btm_ble_int.h
+++ b/system/stack/btm/btm_ble_int.h
@@ -65,7 +65,7 @@ extern void btm_ble_link_sec_check(const RawAddress& bd_addr,
extern void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk,
const Octet16& stk);
extern tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,
- tSMP_EVT_DATA* p_data);
+ const tSMP_EVT_DATA* p_data);
extern tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr,
tBTM_BLE_SEC_ACT sec_act,
uint8_t link_role);
diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h
index ca159ddb16..2d5fc41400 100644
--- a/system/stack/btm/btm_iso_impl.h
+++ b/system/stack/btm/btm_iso_impl.h
@@ -692,6 +692,7 @@ struct iso_impl {
evt.p_msg = p_msg;
evt.cig_id = iso->cig_id;
+ evt.seq_nb = seq_nb;
cig_callbacks_->OnCisEvent(kIsoEventCisDataAvailable, &evt);
}
diff --git a/system/stack/include/btm_iso_api_types.h b/system/stack/include/btm_iso_api_types.h
index 54a965f77a..05a444973f 100644
--- a/system/stack/include/btm_iso_api_types.h
+++ b/system/stack/include/btm_iso_api_types.h
@@ -95,6 +95,7 @@ struct cis_data_evt {
uint16_t cis_conn_hdl;
uint32_t ts;
uint16_t evt_lost;
+ uint16_t seq_nb;
BT_HDR* p_msg;
};
diff --git a/system/stack/include/smp_api_types.h b/system/stack/include/smp_api_types.h
index f56bf670e1..42b61bed38 100644
--- a/system/stack/include/smp_api_types.h
+++ b/system/stack/include/smp_api_types.h
@@ -212,10 +212,11 @@ enum : uint8_t {
typedef uint8_t tSMP_AUTH_REQ;
-#define SMP_SEC_NONE 0
-#define SMP_SEC_UNAUTHENTICATE (1 << 0)
-#define SMP_SEC_AUTHENTICATED (1 << 2)
-typedef uint8_t tSMP_SEC_LEVEL;
+typedef enum : uint8_t {
+ SMP_SEC_NONE = 0,
+ SMP_SEC_UNAUTHENTICATE = 1,
+ SMP_SEC_AUTHENTICATED = 2,
+} tSMP_SEC_LEVEL;
/* Maximum Encryption Key Size range */
#define SMP_ENCR_KEY_SIZE_MIN 7
@@ -309,6 +310,6 @@ typedef struct {
/* Security Manager events - Called by the stack when Security Manager related
* events occur.*/
typedef tBTM_STATUS(tSMP_CALLBACK)(tSMP_EVT event, const RawAddress& bd_addr,
- tSMP_EVT_DATA* p_data);
+ const tSMP_EVT_DATA* p_data);
#endif // SMP_API_TYPES_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 22:33:57 +0000