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

[WifiAware] fix creator from parcel

Browse Source 
creator should read all content from parcel before verify available

Bug: 144286370
Test: atest android.net.wifi
Change-Id: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
This commit is contained in:
Nate(Qiang) Jiang
2019-11-11 10:28:48 -08:00
parent f7805dede0
commit ee9a5ae15c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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) {
byte[] addr = in.createByteArray();
String interfaceName = in.readString();
int port = in.readInt();
int transportProtocol = in.readInt();
Inet6Address ipv6Addr; Inet6Address ipv6Addr;
try { try {
byte[] addr = in.createByteArray();
String interfaceName = in.readString();
NetworkInterface ni = null; NetworkInterface ni = null;
if (interfaceName != null) { if (interfaceName != null) {
try { try {
@@ -135,11 +137,8 @@ public final class WifiAwareNetworkInfo implements TransportInfo, Parcelable {
ipv6Addr = Inet6Address.getByAddress(null, addr, ni); ipv6Addr = Inet6Address.getByAddress(null, addr, ni);
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
e.printStackTrace(); e.printStackTrace();
return null; return new WifiAwareNetworkInfo(null);
} }
int port = in.readInt();
int transportProtocol = in.readInt();
return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol); return new WifiAwareNetworkInfo(ipv6Addr, port, transportProtocol);
} }