diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-06-06 10:30:11 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2014-06-10 15:42:19 -0700 |
| commit | 25702b39675c51dd4963eb71b66b20126a55cc05 (patch) | |
| tree | c4ee1c293bb8c57368046be4f271c3f0a6834a79 /core/tests | |
| parent | 488662c5700b6fc47d53bace9fd74166b372566e (diff) | |
| download | frameworks_base-25702b39675c51dd4963eb71b66b20126a55cc05.zip frameworks_base-25702b39675c51dd4963eb71b66b20126a55cc05.tar.gz frameworks_base-25702b39675c51dd4963eb71b66b20126a55cc05.tar.bz2 | |
Fix public API of LinkProperties.
bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java | 4 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/net/LinkPropertiesTest.java | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java index db125e6..116a31e 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java @@ -336,7 +336,7 @@ public class AccessPointParserHelper { if (!InetAddress.isNumeric(dnsAddr)) { throw new SAXException(); } - mLinkProperties.addDns(InetAddress.getByName(dnsAddr)); + mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr)); } catch (UnknownHostException e) { throw new SAXException(); } @@ -348,7 +348,7 @@ public class AccessPointParserHelper { if (!InetAddress.isNumeric(dnsAddr)) { throw new SAXException(); } - mLinkProperties.addDns(InetAddress.getByName(dnsAddr)); + mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr)); } catch (UnknownHostException e) { throw new SAXException(); } diff --git a/core/tests/coretests/src/android/net/LinkPropertiesTest.java b/core/tests/coretests/src/android/net/LinkPropertiesTest.java index 553afe0..e649baa 100644 --- a/core/tests/coretests/src/android/net/LinkPropertiesTest.java +++ b/core/tests/coretests/src/android/net/LinkPropertiesTest.java @@ -88,8 +88,8 @@ public class LinkPropertiesTest extends TestCase { source.addLinkAddress(LINKADDRV4); source.addLinkAddress(LINKADDRV6); // set 2 dnses - source.addDns(DNS1); - source.addDns(DNS2); + source.addDnsServer(DNS1); + source.addDnsServer(DNS2); // set 2 gateways source.addRoute(new RouteInfo(GATEWAY1)); source.addRoute(new RouteInfo(GATEWAY2)); @@ -101,8 +101,8 @@ public class LinkPropertiesTest extends TestCase { target.setInterfaceName(NAME); target.addLinkAddress(LINKADDRV4); target.addLinkAddress(LINKADDRV6); - target.addDns(DNS1); - target.addDns(DNS2); + target.addDnsServer(DNS1); + target.addDnsServer(DNS2); target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(GATEWAY2)); target.setMtu(MTU); @@ -114,8 +114,8 @@ public class LinkPropertiesTest extends TestCase { target.setInterfaceName("qmi1"); target.addLinkAddress(LINKADDRV4); target.addLinkAddress(LINKADDRV6); - target.addDns(DNS1); - target.addDns(DNS2); + target.addDnsServer(DNS1); + target.addDnsServer(DNS2); target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(GATEWAY2)); target.setMtu(MTU); @@ -127,8 +127,8 @@ public class LinkPropertiesTest extends TestCase { target.addLinkAddress(new LinkAddress( NetworkUtils.numericToInetAddress("75.208.6.2"), 32)); target.addLinkAddress(LINKADDRV6); - target.addDns(DNS1); - target.addDns(DNS2); + target.addDnsServer(DNS1); + target.addDnsServer(DNS2); target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(GATEWAY2)); target.setMtu(MTU); @@ -139,8 +139,8 @@ public class LinkPropertiesTest extends TestCase { target.addLinkAddress(LINKADDRV4); target.addLinkAddress(LINKADDRV6); // change dnses - target.addDns(NetworkUtils.numericToInetAddress("75.208.7.2")); - target.addDns(DNS2); + target.addDnsServer(NetworkUtils.numericToInetAddress("75.208.7.2")); + target.addDnsServer(DNS2); target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(GATEWAY2)); target.setMtu(MTU); @@ -150,8 +150,8 @@ public class LinkPropertiesTest extends TestCase { target.setInterfaceName(NAME); target.addLinkAddress(LINKADDRV4); target.addLinkAddress(LINKADDRV6); - target.addDns(DNS1); - target.addDns(DNS2); + target.addDnsServer(DNS1); + target.addDnsServer(DNS2); // change gateway target.addRoute(new RouteInfo(NetworkUtils.numericToInetAddress("75.208.8.2"))); target.addRoute(new RouteInfo(GATEWAY2)); @@ -162,8 +162,8 @@ public class LinkPropertiesTest extends TestCase { target.setInterfaceName(NAME); target.addLinkAddress(LINKADDRV4); target.addLinkAddress(LINKADDRV6); - target.addDns(DNS1); - target.addDns(DNS2); + target.addDnsServer(DNS1); + target.addDnsServer(DNS2); target.addRoute(new RouteInfo(GATEWAY1)); target.addRoute(new RouteInfo(GATEWAY2)); // change mtu @@ -185,8 +185,8 @@ public class LinkPropertiesTest extends TestCase { source.addLinkAddress(LINKADDRV4); source.addLinkAddress(LINKADDRV6); // set 2 dnses - source.addDns(DNS1); - source.addDns(DNS2); + source.addDnsServer(DNS1); + source.addDnsServer(DNS2); // set 2 gateways source.addRoute(new RouteInfo(GATEWAY1)); source.addRoute(new RouteInfo(GATEWAY2)); @@ -197,8 +197,8 @@ public class LinkPropertiesTest extends TestCase { target.setInterfaceName(NAME); target.addLinkAddress(LINKADDRV6); target.addLinkAddress(LINKADDRV4); - target.addDns(DNS2); - target.addDns(DNS1); + target.addDnsServer(DNS2); + target.addDnsServer(DNS1); target.addRoute(new RouteInfo(GATEWAY2)); target.addRoute(new RouteInfo(GATEWAY1)); target.setMtu(MTU); |