diff options
| author | Etan Cohen <etancohen@google.com> | 2018-02-02 08:07:20 -0800 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-04-06 19:17:58 +0200 |
| commit | d3762927d245ed5053d9d3febdfa7d62fef9ef79 (patch) | |
| tree | 59b68c23b1815a6537506fb57eea60ec33113186 | |
| parent | c1a53bc372bf946db98cab98e269721b3c816455 (diff) | |
| download | frameworks_base-d3762927d245ed5053d9d3febdfa7d62fef9ef79.tar.gz frameworks_base-d3762927d245ed5053d9d3febdfa7d62fef9ef79.tar.bz2 frameworks_base-d3762927d245ed5053d9d3febdfa7d62fef9ef79.zip | |
[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 503e4a25e9f..ea070332c62 100644 --- a/wifi/java/android/net/wifi/RttManager.java +++ b/wifi/java/android/net/wifi/RttManager.java @@ -730,8 +730,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); } } } else { |