Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev

2014-11-05 19:05:07 +00:00
parent 157cb03474 aadf9b78b4
commit 821255f29e
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -107,6 +107,7 @@ public class StaticIpConfiguration implements Parcelable {
        for (InetAddress dns : dnsServers) {
            lp.addDnsServer(dns);
        }
+        lp.setDomains(domains);
        return lp;
    }