Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc0b76e authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a240 am: 5f4d9350
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a240
  [RTT] ParcelableRttResults parcel code fix
parents 83cb3545 8d2d052b

wifi/java/android/net/wifi/RttManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 {