From: Android Build Merger (Role) <noreply-android-build-merger@google.com>
Date: Fri, 2 Feb 2018 18:16:12 +0000 (+0000)
Subject: [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4... 
X-Git-Tag: android-x86-9.0-r1~91^2~1^2^2~1^2^2~2^2^2~13^2~7^2~6^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee65cf4766c8f1b16ba4026eb5467ceaf1aa7548;p=android-x86%2Fframeworks-base.git

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

Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b
---

ee65cf4766c8f1b16ba4026eb5467ceaf1aa7548
diff --cc wifi/java/android/net/wifi/RttManager.java
index 590ff1b1bfaa,ea070332c62d..8c96774eaeaf
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@@ -766,10 -730,9 +766,10 @@@ 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);
                  }
              } else {
                  dest.writeInt(0);