diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 00:22:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 00:22:24 +0000 |
| commit | 0a5173d14dc3973ab4fad3c900848207679a2f67 (patch) | |
| tree | 42efd5b7e5466d4deff845ab4ee31b16976b203b | |
| parent | a0814fdcd154a085b1d7ef1e28d0c9b54c1ed846 (diff) | |
| parent | e3c4b9038b6043330297cbd0b692446767223a04 (diff) | |
| download | uwb-0a5173d14dc3973ab4fad3c900848207679a2f67.tar.gz | |
Snap for 11065517 from e3c4b9038b6043330297cbd0b692446767223a04 to 24Q1-release
Change-Id: I7b98f3244193f16d8ea96e3093e85d0db2b623da
| -rw-r--r-- | src/rust/uwb_core/src/uci/uci_manager.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rust/uwb_core/src/uci/uci_manager.rs b/src/rust/uwb_core/src/uci/uci_manager.rs index d074085..6609c0e 100644 --- a/src/rust/uwb_core/src/uci/uci_manager.rs +++ b/src/rust/uwb_core/src/uci/uci_manager.rs @@ -787,7 +787,7 @@ impl<T: UciHal, U: UciLogger> UciManagerActor<T, U> { if self.is_hal_opened { debug!("The HAL is still opened when exit, close the HAL"); let _ = self.hal.close().await; - self.on_hal_closed(); + self.on_hal_closed().await; } } @@ -906,7 +906,7 @@ impl<T: UciHal, U: UciLogger> UciManagerActor<T, U> { debug!("Force closing the UCI HAL"); let close_result = self.hal.close().await; self.logger.log_hal_close(&close_result); - self.on_hal_closed(); + self.on_hal_closed().await; let _ = result_sender.send(Ok(UciResponse::CloseHal)); } else { if !self.is_hal_opened { @@ -918,7 +918,7 @@ impl<T: UciHal, U: UciLogger> UciManagerActor<T, U> { let result = self.hal.close().await; self.logger.log_hal_close(&result); if result.is_ok() { - self.on_hal_closed(); + self.on_hal_closed().await; } let _ = result_sender.send(result.map(|_| UciResponse::CloseHal)); } @@ -1136,7 +1136,7 @@ impl<T: UciHal, U: UciLogger> UciManagerActor<T, U> { } None => { warn!("UciHal dropped the packet_sender unexpectedly."); - self.on_hal_closed(); + self.on_hal_closed().await; return; } }; @@ -1418,7 +1418,8 @@ impl<T: UciHal, U: UciLogger> UciManagerActor<T, U> { self.packet_receiver = packet_receiver; } - fn on_hal_closed(&mut self) { + async fn on_hal_closed(&mut self) { + self.session_id_to_token_map.lock().await.clear(); self.is_hal_opened = false; self.packet_receiver = mpsc::unbounded_channel().1; self.last_raw_cmd = None; |