From c1dfd0717fcf0ecba627b400e72e80dc2b5a6eef Mon Sep 17 00:00:00 2001 From: Shreshta Manu Date: Tue, 30 May 2023 21:24:10 +0000 Subject: [uwb] Fix device role for dt tag Device role for dt tag should be 8 and not 2. 2 is used for device type. Bug: 283939855 Test atest ServiceUwbTests Change-Id: I96e20fc87786efe61ccf6ea41601e48abc854992 Merged-In: Ic6cb30cf039b5db913388c8713c4f527a0b7ebf9 --- service/java/com/android/server/uwb/params/FiraEncoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/java/com/android/server/uwb/params/FiraEncoder.java b/service/java/com/android/server/uwb/params/FiraEncoder.java index cc40e9d4..1544c506 100644 --- a/service/java/com/android/server/uwb/params/FiraEncoder.java +++ b/service/java/com/android/server/uwb/params/FiraEncoder.java @@ -64,7 +64,7 @@ public class FiraEncoder extends TlvEncoder { int deviceRole = params.getDeviceRole(); TlvBuffer.Builder tlvBufferBuilder = new TlvBuffer.Builder(); - if (deviceRole != FiraParams.RANGING_DEVICE_TYPE_DT_TAG) { + if (deviceRole != FiraParams.RANGING_DEVICE_DT_TAG) { ByteBuffer dstAddressList = ByteBuffer.allocate(1024); for (UwbAddress address : params.getDestAddressList()) { dstAddressList.put(getComputedMacAddress(address)); @@ -133,13 +133,13 @@ public class FiraEncoder extends TlvEncoder { } if (params.getProtocolVersion().getMajor() >= 2) { // Initiation time Changed from 4 byte field to 8 byte field in version 2. - if (deviceRole != FiraParams.RANGING_DEVICE_TYPE_DT_TAG) { + if (deviceRole != FiraParams.RANGING_DEVICE_DT_TAG) { tlvBufferBuilder.putLong(ConfigParam.UWB_INITIATION_TIME, params.getInitiationTime()); } tlvBufferBuilder.putByte(ConfigParam.LINK_LAYER_MODE, (byte) params.getLinkLayerMode()); } else { - if (deviceRole != FiraParams.RANGING_DEVICE_TYPE_DT_TAG) { + if (deviceRole != FiraParams.RANGING_DEVICE_DT_TAG) { tlvBufferBuilder.putInt(ConfigParam.UWB_INITIATION_TIME, Math.toIntExact(params.getInitiationTime())); } -- cgit v1.2.3