Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"

automerge: fba459d

* commit 'fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

2 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java
index 71df60ad88f0..6159e1efb60b 100644
--- a/core/java/android/net/DhcpResults.java
+++ b/core/java/android/net/DhcpResults.java
@@ -200,7 +200,7 @@ public class DhcpResults extends StaticIpConfiguration {
         vendorInfo = info;
     }
 
-    public void setDomains(String domains) {
-        domains = domains;
+    public void setDomains(String newDomains) {
+        domains = newDomains;
     }
 }
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 8bf8f2ebafc6..365f2b697e78 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -114,6 +114,7 @@ public class StaticIpConfiguration implements Parcelable {
         for (InetAddress dns : dnsServers) {
             lp.addDnsServer(dns);
         }
+        lp.setDomains(domains);
         return lp;
     }