Snap for 9691662 from 4c4c22ddc3f874c192647690863a01e4f2dc5f1b to mainline-mediaprovider-releaseaml_mpr_331812020aml_mpr_331711020android13-mainline-mediaprovider-release

Change-Id: Iabbf90d13cb1170b4daaf5cbdf4d9a11176b1a04

5 files changed, 6 insertions, 10 deletions

diff --git a/src/rust/uwb_core/src/service/uwb_service.rs b/src/rust/uwb_core/src/service/uwb_service.rs
index 8c47243..a2ecb85 100644
--- a/src/rust/uwb_core/src/service/uwb_service.rs
+++ b/src/rust/uwb_core/src/service/uwb_service.rs
@@ -60,7 +60,7 @@ pub trait UwbServiceCallback: 'static {
     /// Notify the vendor notification is received.
     fn on_vendor_notification_received(&mut self, gid: u32, oid: u32, payload: Vec<u8>);
 
-    // TODO(b/261762781): In the future, add a callback here to notify the Data Rx packet.
+    // TODO(b/270443790): In the future, add a callback here to notify the Data Rx packet.
 }
 
 /// A placeholder implementation for UwbServiceCallback that does nothing.
diff --git a/src/rust/uwb_core/src/session/session_manager.rs b/src/rust/uwb_core/src/session/session_manager.rs
index 92e7923..c525e07 100644
--- a/src/rust/uwb_core/src/session/session_manager.rs
+++ b/src/rust/uwb_core/src/session/session_manager.rs
@@ -350,7 +350,7 @@ impl<T: UciManager> SessionManagerActor<T> {
                 match self.active_sessions.get(&session_id) {
                     Some(_) => {
                         /*
-                         * TODO(b/261886903): Handle the DataCredit notification in the new
+                         * TODO(b/270443790): Handle the DataCredit notification in the new
                          * code flow.
                          */
                     }
@@ -370,7 +370,7 @@ impl<T: UciManager> SessionManagerActor<T> {
                 match self.active_sessions.get(&session_id) {
                     Some(_) => {
                         /*
-                         * TODO(b/261886903): Handle the DataTransferStatus notification in the
+                         * TODO(b/270443790): Handle the DataTransferStatus notification in the
                          * new code flow.
                          */
                     }
diff --git a/src/rust/uwb_core/src/uci/pcapng_block.rs b/src/rust/uwb_core/src/uci/pcapng_block.rs
index c94ddac..6fcc670 100644
--- a/src/rust/uwb_core/src/uci/pcapng_block.rs
+++ b/src/rust/uwb_core/src/uci/pcapng_block.rs
@@ -143,7 +143,7 @@ pub struct InterfaceDescriptionBlockBuilder {
 impl Default for InterfaceDescriptionBlockBuilder {
     fn default() -> Self {
         Self {
-            link_type: 293, // USB 2.0 Low Speed
+            link_type: 299, // FiRa UCI
             snap_len: 0,    // unlimited
             block_options: vec![],
         }
@@ -422,7 +422,7 @@ mod tests {
     #[test]
     fn test_interface_description_block_with_options_build() {
         let comment_opt = BlockOption::new(0x1, "ABCDEF".to_owned().into_bytes());
-        let link_type: u16 = 293; // 0x125
+        let link_type: u16 = 299; // 0x12b
         let snap_len: u32 = 0;
         let interface_description_block = InterfaceDescriptionBlockBuilder::new()
             .link_type(link_type)
@@ -433,7 +433,7 @@ mod tests {
         let expected_block: Vec<u8> = vec![
             0x01, 0x00, 0x00, 0x00, // block type
             0x24, 0x00, 0x00, 0x00, // block length
-            0x25, 0x01, 0x00, 0x00, // link type, reserved
+            0x2b, 0x01, 0x00, 0x00, // link type, reserved
             0x00, 0x00, 0x00, 0x00, // SnapLen
             0x01, 0x00, 0x06, 0x00, // option code, padded length
             0x41, 0x42, 0x43, 0x44, // option (ABCD)
diff --git a/src/rust/uwb_core/src/uci/uci_hal.rs b/src/rust/uwb_core/src/uci/uci_hal.rs
index 27c593d..58bf6c6 100644
--- a/src/rust/uwb_core/src/uci/uci_hal.rs
+++ b/src/rust/uwb_core/src/uci/uci_hal.rs
@@ -50,9 +50,6 @@ pub trait UciHal: 'static + Send {
     ///
     /// The caller should call this method after the response of the previous send_command() is
     /// received.
-    ///
-    /// TODO(b/261886903): For the Data Packet Tx flow, we need to add a similar send_data()
-    /// API which implements fragmentation on the Data packet and calls send_packet().
     async fn send_command(&mut self, cmd: UciCommand) -> Result<()> {
         // A UCI command message may consist of multiple UCI packets when the payload is over the
         // maximum packet size. We convert the command into list of UciHalPacket, then send the
diff --git a/src/rust/uwb_core/src/uci/uci_manager_sync.rs b/src/rust/uwb_core/src/uci/uci_manager_sync.rs
index 02e4c85..dd41d2c 100644
--- a/src/rust/uwb_core/src/uci/uci_manager_sync.rs
+++ b/src/rust/uwb_core/src/uci/uci_manager_sync.rs
@@ -149,7 +149,6 @@ impl<U: UciManager> UciManagerSync<U> {
             mpsc::unbounded_channel::<RawUciMessage>();
         let (data_rcv_notification_sender, data_rcv_notification_receiver) =
             mpsc::unbounded_channel::<DataRcvNotification>();
-        // TODO(b/261762781):Add a similar channel for Data Packet Rx
         self.runtime_handle.to_owned().block_on(async {
             self.uci_manager.set_core_notification_sender(core_notification_sender).await;
             self.uci_manager.set_session_notification_sender(session_notification_sender).await;