summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2018-02-08 01:11:51 +0000
committer android-build-merger <android-build-merger@google.com> 2018-02-08 01:11:51 +0000
commit8fb67cb883ccd02055d2cfb3d05ece14d36de5cd (patch)
treebeb8e7a7f9e062a42de366a52dc8baca3f67a383
parent0cc517080184d6b32a7fa18027df55edb6cccccf (diff)
parentf1ff9486710971147fa19084a2a09dc072f0109a (diff)
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc am: 0d2044af4b
am: f1ff948671 Change-Id: Ia9ca0839e05779d02560b07e1ab7103d9779c06e
-rw-r--r--wifi/java/android/net/wifi/RttManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java
index dc5ba0cc83b5..12a8ddf9fcdc 100644
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -847,8 +847,8 @@ public class RttManager {
}
dest.writeByte(result.LCR.id);
if (result.LCR.id != (byte) 0xFF) {
- dest.writeInt((byte) result.LCR.data.length);
- dest.writeByte(result.LCR.id);
+ dest.writeByte((byte) result.LCR.data.length);
+ dest.writeByteArray(result.LCR.data);
}
dest.writeByte(result.secure ? (byte) 1 : 0);
}