Merge "Also include the domain when parceling StaticIpConfiguration." automerge: 998c8f7 automerge: 5b392ee

automerge: e142cde

* commit 'e142cde1b354022044aaade6bee226c0010ea953':
  Also include the domain when parceling StaticIpConfiguration.

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();
     }
 }