diff options
| author | 2018-02-07 22:41:26 +0000 | |
|---|---|---|
| committer | 2018-02-07 22:41:26 +0000 | |
| commit | a6d45d976823bda58ea5737056ea86bdaa3cc7f1 (patch) | |
| tree | 03d749a52ac827aa9c589594fcbf389450cdc5ef | |
| parent | 4af59f1c9709628e1873a60296aa9e4f55e06581 (diff) | |
| parent | e016e9c97589b3d21cced5e7c9a1fa4f3562e3f2 (diff) | |
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
| -rw-r--r-- | wifi/java/android/net/wifi/RttManager.java | 4 |
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 590ff1b1bfaa..8c96774eaeaf 100644 --- a/wifi/java/android/net/wifi/RttManager.java +++ b/wifi/java/android/net/wifi/RttManager.java @@ -766,8 +766,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); } |