From 6d0eef4d2cc6f0857f4f87f744b1ce301a2c2399 Mon Sep 17 00:00:00 2001 From: "Nate(Qiang) Jiang" Date: Mon, 11 Nov 2019 10:28:48 -0800 Subject: [PATCH] [WifiAware] fix creator from parcel creator should read all content from parcel before verify available Bug: 144286370 Test: atest android.net.wifi Change-Id: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3 Merged-In: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3 --- .../android/net/wifi/aware/WifiAwareNetworkInfo.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java b/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java index fd26817bfd79b..e9fb37ea0c298 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java @@ -120,10 +120,12 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable { new Creator() { @Override public WifiAwareNetworkInfo createFromParcel(Parcel in) { + byte[] addr = in.createByteArray(); + String interfaceName = in.readString(); + int port = in.readInt(); + int transportProtocol = in.readInt(); Inet6Address ipv6Addr; try { - byte[] addr = in.createByteArray(); - String interfaceName = in.readString(); NetworkInterface ni = null; if (interfaceName != null) { try { @@ -137,9 +139,6 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable { e.printStackTrace(); return null; } - int port = in.readInt(); - int transportProtocol = in.readInt(); - return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol); }