commit fba459d3457a0cb61bcb657c9fafadf0ccea27a9
author Lorenzo Colitti <lorenzo@google.com> Fri Jan 30 07:00:38 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 30 07:00:38 2015 +0000
tree 1118087765b72fb4a30876392efcd1aa02b65db8
parent dbd03924d83ab03e6e8e45d1d041dc8d162180cf
parent b3b70975d9b1d9969dc58ed880baa13509a8933d

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

core/java/android/net/DhcpResults.java

diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java
index 71df60a..6159e1e 100644
--- a/core/java/android/net/DhcpResults.java
+++ b/core/java/android/net/DhcpResults.java
@@ -200,7 +200,7 @@
         vendorInfo = info;
     }
 
-    public void setDomains(String domains) {
-        domains = domains;
+    public void setDomains(String newDomains) {
+        domains = newDomains;
     }
 }

core/java/android/net/StaticIpConfiguration.java

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 8bf8f2e..365f2b6 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -114,6 +114,7 @@
         for (InetAddress dns : dnsServers) {
             lp.addDnsServer(dns);
         }
+        lp.setDomains(domains);
         return lp;
     }