diff options
| author | Etan Cohen <etancohen@google.com> | 2018-02-02 08:07:20 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-08 04:11:48 +0000 |
| commit | 5a3d2708cd2289a4882927c0e2cb0d3c21a99c02 (patch) | |
| tree | 00aca94d5e2e0fc9e68534261955ac86f2712f85 | |
| parent | 09ba8fdffd9c8d74fdc6bfb51bcebc27fc43884a (diff) | |
| download | base-5a3d2708cd2289a4882927c0e2cb0d3c21a99c02.tar.gz | |
[RTT] ParcelableRttResults parcel code fix
ParcelableRttResults was unparceled incorrectly.
Bug: 70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813
(cherry picked from commit e1e5a2409c8bef2481e68d9329f87bb8037afa45)
| -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 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); } |