RTT LCI API (Service Side)

Bug: 111439464
Test: All unit tests pass
Change-Id: I9cd0659e3ec8ce1807e03b657ce206f3e10b8201

3 files changed, 16 insertions, 13 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
index be43c7af7..d2f22da6a 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
@@ -192,8 +192,8 @@ public class RttNativeTest {
                 equalTo(MacAddress.fromString("00:01:02:03:04:00").toByteArray()));
         collector.checkThat("entry 0: rtt type", rttConfig.type, equalTo(RttType.TWO_SIDED));
         collector.checkThat("entry 0: peer type", rttConfig.peer, equalTo(RttPeerType.AP));
-        collector.checkThat("entry 0: lci", rttConfig.mustRequestLci, equalTo(false));
-        collector.checkThat("entry 0: lcr", rttConfig.mustRequestLcr, equalTo(false));
+        collector.checkThat("entry 0: lci", rttConfig.mustRequestLci, equalTo(true));
+        collector.checkThat("entry 0: lcr", rttConfig.mustRequestLcr, equalTo(true));
 
         rttConfig = halRequest.get(1);
         collector.checkThat("entry 1: MAC", rttConfig.addr,
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 3d81759ec..19a5aa543 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
@@ -342,7 +342,7 @@ public class RttServiceImplTest {
         RangingResult removed = results.second.remove(results.second.size() - 1);
         results.second.add(
                 new RangingResult(RangingResult.STATUS_FAIL, removed.getPeerHandle(), 0, 0, 0, 0, 0,
-                        null, null, 0));
+                        null, null, null, 0));
         mDut.onRangingResults(mIntCaptor.getValue(), results.first);
         mMockLooper.dispatchAll();
 
@@ -735,12 +735,12 @@ public class RttServiceImplTest {
         RangingResult removed = results.second.remove(2);
         results.second.add(
                 new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, 0, 0,
-                        null, null, 0));
+                        null, 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, 0, 0,
-                        null, null, 0));
+                        null, null, null, 0));
 
         // (1) request ranging operation
         mDut.startRanging(mockIbinder, mPackageName, null, request, mockCallback);
@@ -782,7 +782,7 @@ public class RttServiceImplTest {
         for (RangingResult result : results.second) {
             allFailResults.add(
                     new RangingResult(RangingResult.STATUS_FAIL, result.getMacAddress(), 0, 0, 0, 0,
-                            0, null, null, 0));
+                            0, null, null, null, 0));
         }
 
         // (1) request ranging operation
@@ -826,13 +826,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, 0, 0, null, null, 0));
+                        removed.getMacAddress(), 0, 0, 0, 0, 0, null, 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, 0, 0,
-                        null, null, 0));
+                        null, 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 9cd19fe23..8d3a5cbde 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++,
-                            8, 5, null, null, rangeTimestampBase++);
+                            8, 5, null, null, null, rangeTimestampBase++);
                 } else {
                     rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                             peer.peerHandle, rangeCmBase++, rangeStdDevCmBase++, rssiBase++,
-                            8, 5, null, null, rangeTimestampBase++);
+                            8, 5, null, null, null, rangeTimestampBase++);
                 }
                 results.add(rangingResult);
                 halResults.add(getMatchingRttResult(rangingResult, peer.macAddress));
@@ -127,13 +127,16 @@ public class RttTestUtils {
         } else {
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("10:01:02:03:04:05"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, 8, 4, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 8, 4, null, null,
+                    null, rangeTimestampBase++));
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("1A:0B:0C:0D:0E:0F"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, 9, 3, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 9, 3, null, null,
+                    null, rangeTimestampBase++));
             results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     MacAddress.fromString("08:09:08:07:06:05"), rangeCmBase++,
-                    rangeStdDevCmBase++, rssiBase++, 10, 2, null, null, rangeTimestampBase++));
+                    rangeStdDevCmBase++, rssiBase++, 10, 2, null, null,
+                    null, rangeTimestampBase++));
             halResults.add(getMatchingRttResult(results.get(0), null));
             halResults.add(getMatchingRttResult(results.get(1), null));
             halResults.add(getMatchingRttResult(results.get(2), null));