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

* changes:
  [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

View File

@@ -730,8 +730,8 @@ public class RttManager {
} }
dest.writeByte(result.LCR.id); dest.writeByte(result.LCR.id);
if (result.LCR.id != (byte) 0xFF) { if (result.LCR.id != (byte) 0xFF) {
dest.writeInt((byte) result.LCR.data.length); dest.writeByte((byte) result.LCR.data.length);
dest.writeByte(result.LCR.id); dest.writeByteArray(result.LCR.data);
} }
} }
} else { } else {