Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev

Browse Source 
* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975 am: 839c0ed22d am: 7ae0c44ca4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975 am: 839c0ed22d
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8 am: ee65cf4766 am: d38155fc59 am: e016e9c975
  [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
This commit is contained in:
Etan Cohen
2018-02-07 22:41:26 +00:00
committed by Android (Google) Code Review
parent bf1ecab901 191b47590c
commit d05a3078fc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/RttManager.java
View File

@@ -844,8 +844,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);
}