[RTT] Add API for number of measurements

Add information about the number of attemped and successful measurements
used to calculate the final results (especially critical for standard
deviation).

Bug: 76445930
Test: unit tests & integration tests
Change-Id: I801a6e0cbceebf9ea01dfb555d7b66ba04444413

2 files changed, 18 insertions, 16 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
index 0172e3848..a65920384 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
@@ -316,8 +316,8 @@ public class RttServiceImplTest {
         results.first.remove(results.first.size() - 1);
         RangingResult removed = results.second.remove(results.second.size() - 1);
         results.second.add(
-                new RangingResult(RangingResult.STATUS_FAIL, removed.getPeerHandle(), 0, 0, 0, null,
-                        null, 0));
+                new RangingResult(RangingResult.STATUS_FAIL, removed.getPeerHandle(), 0, 0, 0, 0, 0,
+                        null, null, 0));
         mDut.onRangingResults(mIntCaptor.getValue(), results.first);
         mMockLooper.dispatchAll();
 
@@ -652,13 +652,13 @@ public class RttServiceImplTest {
         results.first.remove(2); // remove a direct AWARE request
         RangingResult removed = results.second.remove(2);
         results.second.add(
-                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, null,
-                        null, 0));
+                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, 0, 0,
+                        null, null, 0));
         results.first.remove(0); // remove an AP request
         removed = results.second.remove(0);
         results.second.add(
-                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, null,
-                        null, 0));
+                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, 0, 0,
+                        null, null, 0));
 
         // (1) request ranging operation
         mDut.startRanging(mockIbinder, mPackageName, null, request, mockCallback);
@@ -693,8 +693,8 @@ public class RttServiceImplTest {
         List<RangingResult> allFailResults = new ArrayList<>();
         for (RangingResult result : results.second) {
             allFailResults.add(
-                    new RangingResult(RangingResult.STATUS_FAIL, result.getMacAddress(), 0, 0, 0,
-                            null, null, 0));
+                    new RangingResult(RangingResult.STATUS_FAIL, result.getMacAddress(), 0, 0, 0, 0,
+                            0, null, null, 0));
         }
 
         // (1) request ranging operation
@@ -732,13 +732,13 @@ public class RttServiceImplTest {
         RangingResult removed = results.second.remove(1);
         results.second.add(
                 new RangingResult(RangingResult.STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC,
-                        removed.getMacAddress(), 0, 0, 0, null, null, 0));
+                        removed.getMacAddress(), 0, 0, 0, 0, 0, null, null, 0));
         results.first.remove(
                 0); // remove an AP request (i.e. test combo of missing for different reasons)
         removed = results.second.remove(0);
         results.second.add(
-                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, null,
-                        null, 0));
+                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, 0, 0,
+                        null, null, 0));
 
         when(mockContext.checkCallingOrSelfPermission(
                 android.Manifest.permission.LOCATION_HARDWARE)).thenReturn(
diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
index 4d8ddf4ac..9cd19fe23 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
@@ -115,11 +115,11 @@ public class RttTestUtils {
                 if (peer.peerHandle == null) {
                     rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                             peer.macAddress, rangeCmBase++, rangeStdDevCmBase++, rssiBase++,
-                            null, null, rangeTimestampBase++);
+                            8, 5, null, null, rangeTimestampBase++);
                 } else {
                     rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                             peer.peerHandle, rangeCmBase++, rangeStdDevCmBase++, rssiBase++,
-                            null, null, rangeTimestampBase++);
+                            8, 5, null, null, rangeTimestampBase++);
                 }
                 results.add(rangingResult);
                 halResults.add(getMatchingRttResult(rangingResult, peer.macAddress));
@@ -127,13 +127,13 @@ public class RttTestUtils {
         } else {
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("10:01:02:03:04:05"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 8, 4, null, null, rangeTimestampBase++));
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("1A:0B:0C:0D:0E:0F"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 9, 3, null, null, rangeTimestampBase++));
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("08:09:08:07:06:05"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 10, 2, null, null, rangeTimestampBase++));
             halResults.add(getMatchingRttResult(results.get(0), null));
             halResults.add(getMatchingRttResult(results.get(1), null));
             halResults.add(getMatchingRttResult(results.get(2), null));
@@ -152,6 +152,8 @@ public class RttTestUtils {
         rttResult.distanceInMm = rangingResult.getDistanceMm();
         rttResult.distanceSdInMm = rangingResult.getDistanceStdDevMm();
         rttResult.rssi = rangingResult.getRssi() * -2;
+        rttResult.numberPerBurstPeer = (byte) rangingResult.getNumAttemptedMeasurements();
+        rttResult.successNumber = rangingResult.getNumSuccessfulMeasurements();
         rttResult.timeStampInUs = rangingResult.getRangingTimestampMillis() * 1000;
 
         return rttResult;