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

Commit d76f4079 authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang Committed by android-build-merger
Browse files

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

am: e3ff000c

Change-Id: I3666a418a1987116736aa7c86113de7dc15bd8f7
parents d277bd6b e3ff000c

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);

                }