diff options
| author | 2025-03-18 16:45:16 -0700 | |
|---|---|---|
| committer | 2025-03-18 16:45:16 -0700 | |
| commit | 65ff66e98a4e06b6a4fa333ec707bae101371e3b (patch) | |
| tree | a451c67439cc0a88404e0968900e71c8a5bb7b1d | |
| parent | 28ffa97f7edf26eca8778dad38c044bdcdc9ca03 (diff) | |
| parent | 750ce266ec7d4692a300448da1fbd7f0e928d07a (diff) | |
Merge "RemoveBond: Fix typo for pending devices awaiting removal" into main
| -rw-r--r-- | system/bta/dm/bta_dm_act.cc | 2 | ||||
| -rw-r--r-- | system/bta/dm/bta_dm_int.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc index 48e0f16c99..ddc481171f 100644 --- a/system/bta/dm/bta_dm_act.cc +++ b/system/bta/dm/bta_dm_act.cc @@ -545,7 +545,7 @@ void bta_dm_remove_device(const RawAddress& target) { if (le_connected || bredr_connected) { // Wait for all transports to be disconnected - tBTA_DM_REMOVE_PENDNIG node = {pseudo_addr, identity_addr, le_connected, bredr_connected}; + tBTA_DM_REMOVE_PENDING node = {pseudo_addr, identity_addr, le_connected, bredr_connected}; bta_dm_cb.pending_removals.push_back(node); log::info( "Waiting for disconnection over LE:{}, BR/EDR:{} for pseudo address: {}, identity " diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h index 521a8072de..26f7e4d97c 100644 --- a/system/bta/dm/bta_dm_int.h +++ b/system/bta/dm/bta_dm_int.h @@ -81,7 +81,7 @@ inline std::string device_info_text(tBTA_DM_DEV_INFO info) { #define BTA_DM_PM_EXECUTE 3 typedef uint8_t tBTA_DM_PM_REQ; -struct tBTA_DM_REMOVE_PENDNIG { +struct tBTA_DM_REMOVE_PENDING { RawAddress pseudo_addr; RawAddress identity_addr; bool le_connected; @@ -215,7 +215,7 @@ typedef struct { #endif alarm_t* switch_delay_timer; - std::list<tBTA_DM_REMOVE_PENDNIG> pending_removals; + std::list<tBTA_DM_REMOVE_PENDING> pending_removals; } tBTA_DM_CB; /* DI control block */ |