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

Commit 728dace1 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Also include the domain when parceling StaticIpConfiguration."... 

Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a567 automerge: 5b392ee7
automerge: a0057ad6

* commit 'a0057ad6':
  Also include the domain when parceling StaticIpConfiguration.
parents c519b804 a0057ad6

core/java/android/net/StaticIpConfiguration.java

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ public class StaticIpConfiguration implements Parcelable { 
        for (InetAddress dnsServer : dnsServers) {

            NetworkUtils.parcelInetAddress(dest, dnsServer, flags);

        }

        dest.writeString(domains);

    }



    protected static void readFromParcel(StaticIpConfiguration s, Parcel in) {
@@ -198,5 +199,6 @@ public class StaticIpConfiguration implements Parcelable { 
        for (int i = 0; i < size; i++) {

            s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));

        }

        s.domains = in.readString();

    }

}