From 99366a8aa4b38b90e98db4e156fcd13d47a99ae8 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Wed, 5 Nov 2014 09:35:26 -0500
Subject: [PATCH] Fix DhcpResults.setDomain() and
 StaticIpConfiguration.toLinkProperties()

setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit c53113b37f33c7ed19660c8ec5bfd578e8bb5409)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
---
 core/java/android/net/StaticIpConfiguration.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 8bf8f2ebaf..365f2b697e 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;
     }