Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev (e3ff000c) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -120,10 +120,12 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable {
		new Creator<WifiAwareNetworkInfo>() {
		@Override
		public WifiAwareNetworkInfo createFromParcel(Parcel in) {
		Inet6Address ipv6Addr;
		try {
		byte[] addr = in.createByteArray();
		String interfaceName = in.readString();
		int port = in.readInt();
		int transportProtocol = in.readInt();
		Inet6Address ipv6Addr;
		try {
		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);
		}