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

Merge "Also include the domain when parceling StaticIpConfiguration."

Browse Source 
automerge: c565a56

* commit 'c565a5675ac33d97d5c1caed7a5629412997fb4a':
  Also include the domain when parceling StaticIpConfiguration.
This commit is contained in:
Lorenzo Colitti
2015-01-30 12:15:39 +00:00
committed by android-build-merger
parent 786deba636 c565a5675a
commit 5b392ee758
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();
} }
} }