diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-05-31 01:58:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-31 01:58:33 +0000 |
commit | d0e76a933450a21d254b9a27f88d2acb6f8a92e5 (patch) | |
tree | 10663afadef44a4efe54130386e55b1f5e78a29d | |
parent | 5057a1bfac0f8b8f8323601ff5ad0712e9da39ab (diff) | |
parent | c1dfd0717fcf0ecba627b400e72e80dc2b5a6eef (diff) | |
download | Uwb-d0e76a933450a21d254b9a27f88d2acb6f8a92e5.tar.gz |
Merge "[uwb] Fix device role for dt tag" into udc-dev
-rw-r--r-- | service/java/com/android/server/uwb/params/FiraEncoder.java | 6 |
1 files 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())); } |