commit e5455549ceeb9cecb0a876e1977c4313231ff6be
author Roshan Pius <rpius@google.com> Thu Apr 25 17:26:13 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 25 17:26:13 2024 +0000
tree bf1d7de300451a397000176550084bf948cbc6b2
parent 19b1f7d990ccab4bfdeea561250653a7fd34aeff
parent 5699f8d1b5b3a5e813f041fd998824529c68cd2e

Merge "uwb: set remote address for onDataReceived" into main

service/java/com/android/server/uwb/UwbSessionNotificationManager.java

diff --git a/service/java/com/android/server/uwb/UwbSessionNotificationManager.java b/service/java/com/android/server/uwb/UwbSessionNotificationManager.java
index d32d003..0e8c487 100644
--- a/service/java/com/android/server/uwb/UwbSessionNotificationManager.java
+++ b/service/java/com/android/server/uwb/UwbSessionNotificationManager.java
@@ -626,7 +626,8 @@
             // TODO: Add radar specific @SystemApi
             // Temporary workaround to avoid adding a new @SystemApi for the short-term.
             uwbRangingCallbacks.onDataReceived(
-                    sessionHandle, null, radarDataBundle, new byte[] {});
+                    sessionHandle, UwbAddress.fromBytes(new byte[] {0x0, 0x0}),
+                    radarDataBundle, new byte[] {});
             Log.i(TAG, "IUwbRangingCallbacks - onDataReceived with radar data");
         } catch (Exception e) {
             Log.e(TAG, "IUwbRangingCallbacks - onDataReceived with radar data: Failed");

service/tests/src/com/android/server/uwb/UwbSessionNotificationManagerTest.java

diff --git a/service/tests/src/com/android/server/uwb/UwbSessionNotificationManagerTest.java b/service/tests/src/com/android/server/uwb/UwbSessionNotificationManagerTest.java
index 06d78bd..7f81709 100644
--- a/service/tests/src/com/android/server/uwb/UwbSessionNotificationManagerTest.java
+++ b/service/tests/src/com/android/server/uwb/UwbSessionNotificationManagerTest.java
@@ -54,6 +54,7 @@
 import android.uwb.RangingChangeReason;
 import android.uwb.RangingReport;
 import android.uwb.SessionHandle;
+import android.uwb.UwbAddress;
 
 import androidx.test.runner.AndroidJUnit4;
 
@@ -756,7 +757,7 @@
 
         verify(mIUwbRangingCallbacks).onDataReceived(
                 eq(mSessionHandle),
-                eq(null),
+                eq(UwbAddress.fromBytes(new byte[] {0x00, 0x00})),
                 argThat(p -> p.getInt("sweep_offset")
                         == testUwbRadarDataAndRadarData.second.getSweepOffset()),
                 eq(new byte[] {}));