LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Also include the domain when parceling StaticIpConfiguration."

Browse Source
This commit is contained in:
Lorenzo Colitti
2015-01-30 07:07:48 +00:00
committed by Gerrit Code Review
parent c0e636aae7 68a1a34ec0
commit c40bd27e25
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/StaticIpConfiguration.java
View File

@@ -188,6 +188,7 @@ public class StaticIpConfiguration implements Parcelable {
for (InetAddress dnsServer : dnsServers) { for (InetAddress dnsServer : dnsServers) {
NetworkUtils.parcelInetAddress(dest, dnsServer, flags); NetworkUtils.parcelInetAddress(dest, dnsServer, flags);
} }
dest.writeString(domains);
} }
protected static void readFromParcel(StaticIpConfiguration s, Parcel in) { protected static void readFromParcel(StaticIpConfiguration s, Parcel in) {
@@ -198,5 +199,6 @@ public class StaticIpConfiguration implements Parcelable {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
s.dnsServers.add(NetworkUtils.unparcelInetAddress(in)); s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));
} }
s.domains = in.readString();
} }
} }