diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-30 07:07:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-30 07:07:49 +0000 |
| commit | c565a5675ac33d97d5c1caed7a5629412997fb4a (patch) | |
| tree | 3b91abd001962c7e525634d4b8929ae1c90fe00e | |
| parent | fba459d3457a0cb61bcb657c9fafadf0ccea27a9 (diff) | |
| parent | d0cc544039ee7d35d0f1aa9fc9d0f57ef6dfbfb9 (diff) | |
| download | frameworks_base-c565a5675ac33d97d5c1caed7a5629412997fb4a.zip frameworks_base-c565a5675ac33d97d5c1caed7a5629412997fb4a.tar.gz frameworks_base-c565a5675ac33d97d5c1caed7a5629412997fb4a.tar.bz2 | |
Merge "Also include the domain when parceling StaticIpConfiguration."
| -rw-r--r-- | core/java/android/net/StaticIpConfiguration.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index 365f2b6..37ee961 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -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(); } } |