Snap for 11051137 from aa2d93d75fb1ba319c644bd4abb346a50e7254c6 to 24Q1-release

Change-Id: I94cdf6e4c97e400deaa841762d5ef348eff36404

5 files changed, 11 insertions, 6 deletions

diff --git a/src/Android.bp b/src/Android.bp
index c0448b7..16cb3a1 100755
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -14,7 +14,7 @@ rust_defaults {
         "libbytes",
         "liblog_rust",
         "libnum_traits",
-        "libthiserror",
+        "libpdl_runtime",
         "libzeroize",
     ],
     host_supported: true,
@@ -88,6 +88,7 @@ rust_defaults {
         "libbytes",
         "libnum_traits",
         "liblog_rust",
+        "libpdl_runtime",
         "libthiserror",
         "libtokio",
         "libuwb_uci_packets",
diff --git a/src/rust/uwb_core/src/uci/notification.rs b/src/rust/uwb_core/src/uci/notification.rs
index d99f602..c53d0e9 100644
--- a/src/rust/uwb_core/src/uci/notification.rs
+++ b/src/rust/uwb_core/src/uci/notification.rs
@@ -15,8 +15,9 @@
 use std::convert::{TryFrom, TryInto};
 
 use log::{debug, error};
+use pdl_runtime::Packet;
 use uwb_uci_packets::{
-    parse_diagnostics_ntf, radar_bytes_per_sample_value, Packet, RadarDataRcv, RadarSweepDataRaw,
+    parse_diagnostics_ntf, radar_bytes_per_sample_value, RadarDataRcv, RadarSweepDataRaw,
     UCI_PACKET_HEADER_LEN, UCI_RADAR_SEQUENCE_NUMBER_LEN, UCI_RADAR_TIMESTAMP_LEN,
     UCI_RADAR_VENDOR_DATA_LEN_LEN,
 };
diff --git a/src/rust/uwb_core/src/uci/uci_hal.rs b/src/rust/uwb_core/src/uci/uci_hal.rs
index 151a808..098840a 100644
--- a/src/rust/uwb_core/src/uci/uci_hal.rs
+++ b/src/rust/uwb_core/src/uci/uci_hal.rs
@@ -17,8 +17,9 @@
 use std::convert::TryInto;
 
 use async_trait::async_trait;
+use pdl_runtime::Packet;
 use tokio::sync::mpsc;
-use uwb_uci_packets::{Packet, UciControlPacket, UciControlPacketHal};
+use uwb_uci_packets::{UciControlPacket, UciControlPacketHal};
 
 use crate::error::Result;
 use crate::params::uci_packets::SessionId;
diff --git a/src/rust/uwb_core/src/uci/uci_logger.rs b/src/rust/uwb_core/src/uci/uci_logger.rs
index 7045b43..d1e8db5 100644
--- a/src/rust/uwb_core/src/uci/uci_logger.rs
+++ b/src/rust/uwb_core/src/uci/uci_logger.rs
@@ -15,8 +15,9 @@
 //! Trait definition for UciLogger.
 use std::convert::TryFrom;
 
+use pdl_runtime::Packet;
 use uwb_uci_packets::{
-    AppConfigTlv, AppConfigTlvType, Packet, SessionConfigCommandChild, SessionConfigResponseChild,
+    AppConfigTlv, AppConfigTlvType, SessionConfigCommandChild, SessionConfigResponseChild,
     SessionGetAppConfigRspBuilder, SessionSetAppConfigCmdBuilder, UciCommandChild,
     UciControlPacket, UciControlPacketChild, UciDataPacket, UciResponse, UciResponseChild,
     UCI_PACKET_HAL_HEADER_LEN,
@@ -107,7 +108,7 @@ fn filter_uci_response(rsp: UciResponse) -> UciResponse {
 // Log only the Data Packet header bytes, so that we don't log any PII (payload bytes).
 fn filter_uci_data(
     packet: &UciDataPacket,
-) -> std::result::Result<UciDataPacket, uwb_uci_packets::Error> {
+) -> std::result::Result<UciDataPacket, pdl_runtime::Error> {
     // Initialize a (zeroed out) Vec to the same length as the data packet, and then copy over
     // only the Data Packet header bytes into it. This masks out all the payload bytes to 0.
     let data_packet_bytes: Vec<u8> = packet.clone().to_vec();
diff --git a/src/rust/uwb_core/src/uci/uci_manager.rs b/src/rust/uwb_core/src/uci/uci_manager.rs
index a1a97f1..d074085 100644
--- a/src/rust/uwb_core/src/uci/uci_manager.rs
+++ b/src/rust/uwb_core/src/uci/uci_manager.rs
@@ -42,8 +42,9 @@ use crate::uci::timeout_uci_hal::TimeoutUciHal;
 use crate::uci::uci_hal::{UciHal, UciHalPacket};
 use crate::uci::uci_logger::{UciLogger, UciLoggerMode, UciLoggerWrapper};
 use crate::utils::{clean_mpsc_receiver, PinSleep};
+use pdl_runtime::Packet;
 use std::collections::{HashMap, VecDeque};
-use uwb_uci_packets::{Packet, PhaseList, RawUciControlPacket, UciDataSnd, UciDefragPacket};
+use uwb_uci_packets::{PhaseList, RawUciControlPacket, UciDataSnd, UciDefragPacket};
 
 const UCI_TIMEOUT_MS: u64 = 800;
 const MAX_RETRY_COUNT: usize = 3;