commit 0752febf398425c75417be30b7b94265f7e559c3
author Roshan Pius <rpius@google.com> Mon May 01 10:31:05 2023 -0700
committer Roshan Pius <rpius@google.com> Mon May 01 10:59:20 2023 -0700
tree d952705cbf04d3a54d10f25a44aa180610300b02
parent d4fa36c14ffe594213f8a786b37c58d3578e470d

uwb(service): Max # of measurements param seems to be causing an error

Partial revert of aosp/2566133

Bug: 280305847
Test: atest ServiceUwbTests
Test: atest CtsUwbTestCases
Change-Id: I6c66bef4279a26d0d5d553e753edb96be7829192

service/java/com/android/server/uwb/params/FiraEncoder.java

diff --git a/service/java/com/android/server/uwb/params/FiraEncoder.java b/service/java/com/android/server/uwb/params/FiraEncoder.java
index 03d77d5..b74a38d 100644
--- a/service/java/com/android/server/uwb/params/FiraEncoder.java
+++ b/service/java/com/android/server/uwb/params/FiraEncoder.java
@@ -115,8 +115,6 @@
                         (byte) params.getInBandTerminationAttemptCount())
                 .putByte(ConfigParam.BPRF_PHR_DATA_RATE,
                         (byte) params.getBprfPhrDataRate())
-                .putByte(ConfigParam.MAX_NUMBER_OF_MEASUREMENTS,
-                        (byte) params.getMaxNumberOfMeasurements())
                 .putByte(ConfigParam.STS_LENGTH, (byte) params.getStsLength());
         if (params.getDeviceRole() != FiraParams.RANGING_DEVICE_UT_TAG) {
             tlvBufferBuilder.putInt(ConfigParam.RANGING_INTERVAL, params.getRangingIntervalMs());

service/tests/src/com/android/server/uwb/params/FiraEncoderTest.java

diff --git a/service/tests/src/com/android/server/uwb/params/FiraEncoderTest.java b/service/tests/src/com/android/server/uwb/params/FiraEncoderTest.java
index b0d92e0..fc6ba7b 100644
--- a/service/tests/src/com/android/server/uwb/params/FiraEncoderTest.java
+++ b/service/tests/src/com/android/server/uwb/params/FiraEncoderTest.java
@@ -80,7 +80,7 @@
             UwbUtil.getByteArray("0001010101010201000301000401090501010602060408"
                     + "0260090B01000C01030D01010E01040F0200001002204E11010012010313010014010A"
                     + "1501021601001701011A01011B01191C01001F0100220101230100240100250132260100"
-                    + "2901012A0200002C01002D01002E01012F0101310100320100350101090"
+                    + "2901012A0200002C01002D01002E01012F0101310100350101090"
                     + "4C8000000070206042B04000000002702780528061A5577477E7D1D0807D59E4707D56022");
 
     private static final FiraRangingReconfigureParams.Builder TEST_FIRA_RECONFIGURE_PARAMS =
@@ -121,7 +121,7 @@
             UwbUtil.getByteArray("0001010101000201000301000401090501010602060408"
                     + "0260090B01000C01030D01010E01010F0200001002204E11010412010313010014010A"
                     + "1501021601001701011A01011B01191C01001F0100220101230100240100250132260100"
-                    + "2901012A0200002C01002D01002E01012F0101310100320100350101070206042B04000"
+                    + "2901012A0200002C01002D01002E01012F0101310100350101070206042B04000"
                     + "000002702780528061A5577477E7D3304B004000034041E0000003803010B0A390101");
 
     private final FiraEncoder mFiraEncoder = new FiraEncoder();
@@ -131,7 +131,7 @@
         FiraOpenSessionParams params = TEST_FIRA_OPEN_SESSION_PARAMS.build();
         TlvBuffer tlvs = mFiraEncoder.getTlvBuffer(params);
 
-        assertThat(tlvs.getNoOfParams()).isEqualTo(45);
+        assertThat(tlvs.getNoOfParams()).isEqualTo(44);
         assertThat(tlvs.getByteArray()).isEqualTo(TEST_FIRA_OPEN_SESSION_TLV_DATA);
     }
 
@@ -149,7 +149,7 @@
         FiraOpenSessionParams params = TEST_FIRA_OPEN_SESSION_PARAMS.build();
         TlvBuffer tlvs = TlvEncoder.getEncoder(FiraParams.PROTOCOL_NAME).getTlvBuffer(params);
 
-        assertThat(tlvs.getNoOfParams()).isEqualTo(45);
+        assertThat(tlvs.getNoOfParams()).isEqualTo(44);
         assertThat(tlvs.getByteArray()).isEqualTo(TEST_FIRA_OPEN_SESSION_TLV_DATA);
     }
 
@@ -167,7 +167,7 @@
         FiraOpenSessionParams params = TEST_FIRA_UT_TAG_OPEN_SESSION_PARAM.build();
         TlvBuffer tlvs = mFiraEncoder.getTlvBuffer(params);
 
-        assertThat(tlvs.getNoOfParams()).isEqualTo(47);
+        assertThat(tlvs.getNoOfParams()).isEqualTo(46);
         assertThat(tlvs.getByteArray()).isEqualTo(TEST_FIRA_OPEN_SESSION_TLV_DATA_UT_TAG);
     }
 
@@ -200,12 +200,12 @@
                 UwbUtil.getByteArray("0001010101010201030301000401090501010602060408"
                         + "0260090B01000C01030D01010E01040F0200001002204E110100120103130100"
                         + "14010A1501021601001701011A01011B01191C01001F0100220101230100240100250132"
-                        + "2601002901012A0200002C01002D01002E01012F0101310100320100350101090"
+                        + "2601002901012A0200002C01002D01002E01012F0101310100350101090"
                         + "4C8000000070206042B0400000000451005780578057805780578057805780578"
                         + "1D0807D59E4707D56022");
         TlvBuffer tlvs = mFiraEncoder.getTlvBuffer(params);
 
-        assertThat(tlvs.getNoOfParams()).isEqualTo(44);
+        assertThat(tlvs.getNoOfParams()).isEqualTo(43);
         assertThat(tlvs.getByteArray()).isEqualTo(expected_data);
     }
 }