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

Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev

Browse Source 
am: e3ff000ca5

Change-Id: I3666a418a1987116736aa7c86113de7dc15bd8f7
This commit is contained in:
Nate(Qiang) Jiang
2019-11-12 15:11:59 -08:00
committed by android-build-merger
parent d277bd6b30 e3ff000ca5
commit d76f407953
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wifi/java/android/net/wifi/aware/WifiAwareNetworkInfo.java
View File

@@ -120,10 +120,12 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable {
new Creator<WifiAwareNetworkInfo>() { new Creator<WifiAwareNetworkInfo>() {
@Override @Override
public WifiAwareNetworkInfo createFromParcel(Parcel in) { public WifiAwareNetworkInfo createFromParcel(Parcel in) {
Inet6Address ipv6Addr;
try {
byte[] addr = in.createByteArray(); byte[] addr = in.createByteArray();
String interfaceName = in.readString(); String interfaceName = in.readString();
int port = in.readInt();
int transportProtocol = in.readInt();
Inet6Address ipv6Addr;
try {
NetworkInterface ni = null; NetworkInterface ni = null;
if (interfaceName != null) { if (interfaceName != null) {
try { try {
@@ -137,9 +139,6 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
int port = in.readInt();
int transportProtocol = in.readInt();
return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol); return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol);
} }