commit 839c0ed22d378018a0329271d60d4753e5fb4cff
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Feb 02 18:16:35 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Feb 02 18:16:35 2018 +0000
tree 370659c20564872b71adac8007f45e68b34b19ba
parent abab079bf5d19df78e7c5619631aee158187b723
parent e016e9c97589b3d21cced5e7c9a1fa4f3562e3f2

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975

Change-Id: I57936e6a45df8f40d3d1aa7a72d57ea40e9b5909

wifi/java/android/net/wifi/RttManager.java

diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java
index 590ff1b..8c96774 100644
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -766,8 +766,8 @@
                     }
                     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);
                 }