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." automerge: c40bd27

Browse Source 
automerge: 5b392ee

* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
  Also include the domain when parceling StaticIpConfiguration.
This commit is contained in:
Lorenzo Colitti
2015-01-30 15:56:00 +00:00
committed by android-build-merger
parent bac14852ef c40bd27e25
commit 792622f754
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) {
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();
}
}