diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-11-05 09:35:26 -0500 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2014-11-05 09:35:26 -0500 |
| commit | c53113b37f33c7ed19660c8ec5bfd578e8bb5409 (patch) | |
| tree | a02515bdfc94ae0c528e420ea757083431545a22 /core | |
| parent | d8a21bbedbaeb752b7f458823ed709b9a01c14c1 (diff) | |
| download | frameworks_base-c53113b37f33c7ed19660c8ec5bfd578e8bb5409.zip frameworks_base-c53113b37f33c7ed19660c8ec5bfd578e8bb5409.tar.gz frameworks_base-c53113b37f33c7ed19660c8ec5bfd578e8bb5409.tar.bz2 | |
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.
bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/DhcpResults.java | 4 | ||||
| -rw-r--r-- | core/java/android/net/StaticIpConfiguration.java | 1 |
2 files changed, 3 insertions, 2 deletions
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 @@ 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 5a273cf..598a503 100644 --- 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; } |