diff options
author | Serik Beketayev <serikb@google.com> | 2020-12-09 23:47:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-09 23:47:05 +0000 |
commit | a086c295e71f3f99e39e9df5ae41fcaf2ff0daed (patch) | |
tree | bfc544b9ca47c2ca795907d1d2cead2674677b0b | |
parent | cabc628f668077ccec91e31aef8a83f17d342040 (diff) | |
parent | 9817226d9934509f9e887f6df6639065d231b321 (diff) | |
download | base-a086c295e71f3f99e39e9df5ae41fcaf2ff0daed.tar.gz |
Merge "[Mainline Migration] Migrate NetworkUtils"
13 files changed, 53 insertions, 53 deletions
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index a0faafa779a8..d84ee2a87b43 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -35,7 +35,6 @@ import java.net.Inet4Address; import java.net.InetAddress; import java.net.SocketException; import java.net.UnknownHostException; -import java.util.Collection; import java.util.Locale; import java.util.TreeSet; @@ -342,20 +341,6 @@ public class NetworkUtils { } /** - * Create a string array of host addresses from a collection of InetAddresses - * @param addrs a Collection of InetAddresses - * @return an array of Strings containing their host addresses - */ - public static String[] makeStrings(Collection<InetAddress> addrs) { - String[] result = new String[addrs.size()]; - int i = 0; - for (InetAddress addr : addrs) { - result[i++] = addr.getHostAddress(); - } - return result; - } - - /** * Trim leading zeros from IPv4 address strings * Our base libraries will interpret that as octel.. * Must leave non v4 addresses and host names alone. diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index f1d9669a8309..20ccc07b18dd 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -205,7 +205,7 @@ public final class Proxy { if (host.equalsIgnoreCase("localhost")) { return true; } - if (NetworkUtils.numericToInetAddress(host).isLoopbackAddress()) { + if (InetAddresses.parseNumericAddress(host).isLoopbackAddress()) { return true; } } diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java index a17ff825e21b..babc1d58b1a8 100644 --- a/media/java/android/media/MediaHTTPConnection.java +++ b/media/java/android/media/MediaHTTPConnection.java @@ -19,7 +19,7 @@ package android.media; import static android.media.MediaPlayer.MEDIA_ERROR_UNSUPPORTED; import android.compat.annotation.UnsupportedAppUsage; -import android.net.NetworkUtils; +import android.net.InetAddresses; import android.os.IBinder; import android.os.StrictMode; import android.util.Log; @@ -214,7 +214,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { if (host.equalsIgnoreCase("localhost")) { return true; } - if (NetworkUtils.numericToInetAddress(host).isLoopbackAddress()) { + if (InetAddresses.parseNumericAddress(host).isLoopbackAddress()) { return true; } } catch (IllegalArgumentException iex) { diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java index b2f0c8376db1..f648c3e146de 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/services/core/java/com/android/server/IpSecService.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.net.IIpSecService; import android.net.INetd; +import android.net.InetAddresses; import android.net.IpSecAlgorithm; import android.net.IpSecConfig; import android.net.IpSecManager; @@ -41,7 +42,6 @@ import android.net.IpSecTunnelInterfaceResponse; import android.net.IpSecUdpEncapResponse; import android.net.LinkAddress; import android.net.Network; -import android.net.NetworkUtils; import android.net.TrafficStats; import android.net.util.NetdService; import android.os.Binder; @@ -1083,7 +1083,7 @@ public class IpSecService extends IIpSecService.Stub { throw new IllegalArgumentException("Unspecified address"); } - InetAddress checkAddr = NetworkUtils.numericToInetAddress(inetAddress); + InetAddress checkAddr = InetAddresses.parseNumericAddress(inetAddress); if (checkAddr.isAnyLocalAddress()) { throw new IllegalArgumentException("Inappropriate wildcard address: " + inetAddress); @@ -1467,7 +1467,7 @@ public class IpSecService extends IIpSecService.Stub { private int getFamily(String inetAddress) { int family = AF_UNSPEC; - InetAddress checkAddress = NetworkUtils.numericToInetAddress(inetAddress); + InetAddress checkAddress = InetAddresses.parseNumericAddress(inetAddress); if (checkAddress instanceof Inet4Address) { family = AF_INET; } else if (checkAddress instanceof Inet6Address) { diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 821a967b2b3d..5e86f855c1e7 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -58,7 +58,6 @@ import android.net.Network; import android.net.NetworkPolicyManager; import android.net.NetworkStack; import android.net.NetworkStats; -import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.TetherStatsParcel; import android.net.UidRange; @@ -803,7 +802,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { InterfaceConfiguration cfg = new InterfaceConfiguration(); cfg.setHardwareAddress(p.hwAddr); - final InetAddress addr = NetworkUtils.numericToInetAddress(p.ipv4Addr); + final InetAddress addr = InetAddresses.parseNumericAddress(p.ipv4Addr); cfg.setLinkAddress(new LinkAddress(addr, p.prefixLength)); for (String flag : p.flags) { cfg.setFlag(flag); diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java index 1f0fb5e006b8..712ef7630933 100644 --- a/services/core/java/com/android/server/connectivity/DnsManager.java +++ b/services/core/java/com/android/server/connectivity/DnsManager.java @@ -34,7 +34,6 @@ import android.content.Intent; import android.net.IDnsResolver; import android.net.LinkProperties; import android.net.Network; -import android.net.NetworkUtils; import android.net.ResolverOptionsParcel; import android.net.ResolverParamsParcel; import android.net.Uri; @@ -50,6 +49,7 @@ import android.util.Pair; import java.net.InetAddress; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -364,12 +364,11 @@ public class DnsManager { paramsParcel.successThreshold = mSuccessThreshold; paramsParcel.minSamples = mMinSamples; paramsParcel.maxSamples = mMaxSamples; - paramsParcel.servers = - NetworkUtils.makeStrings(lp.getDnsServers()); + paramsParcel.servers = makeStrings(lp.getDnsServers()); paramsParcel.domains = getDomainStrings(lp.getDomains()); paramsParcel.tlsName = strictMode ? privateDnsCfg.hostname : ""; paramsParcel.tlsServers = - strictMode ? NetworkUtils.makeStrings( + strictMode ? makeStrings( Arrays.stream(privateDnsCfg.ips) .filter((ip) -> lp.isReachable(ip)) .collect(Collectors.toList())) @@ -460,6 +459,21 @@ public class DnsManager { return Settings.Global.getInt(mContentResolver, which, dflt); } + /** + * Create a string array of host addresses from a collection of InetAddresses + * + * @param addrs a Collection of InetAddresses + * @return an array of Strings containing their host addresses + */ + private String[] makeStrings(Collection<InetAddress> addrs) { + String[] result = new String[addrs.size()]; + int i = 0; + for (InetAddress addr : addrs) { + result[i++] = addr.getHostAddress(); + } + return result; + } + private static String getPrivateDnsMode(ContentResolver cr) { String mode = getStringSetting(cr, PRIVATE_DNS_MODE); if (TextUtils.isEmpty(mode)) mode = getStringSetting(cr, PRIVATE_DNS_DEFAULT_MODE); diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 8625a6f470c5..96cbfde2a0a0 100644 --- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java +++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java @@ -40,11 +40,11 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.net.ISocketKeepaliveCallback; +import android.net.InetAddresses; import android.net.InvalidPacketException; import android.net.KeepalivePacketData; import android.net.NattKeepalivePacketData; import android.net.NetworkAgent; -import android.net.NetworkUtils; import android.net.SocketKeepalive.InvalidSocketException; import android.net.TcpKeepalivePacketData; import android.net.util.KeepaliveUtils; @@ -625,8 +625,8 @@ public class KeepaliveTracker { InetAddress srcAddress, dstAddress; try { - srcAddress = NetworkUtils.numericToInetAddress(srcAddrString); - dstAddress = NetworkUtils.numericToInetAddress(dstAddrString); + srcAddress = InetAddresses.parseNumericAddress(srcAddrString); + dstAddress = InetAddresses.parseNumericAddress(dstAddrString); } catch (IllegalArgumentException e) { notifyErrorCallback(cb, ERROR_INVALID_IP_ADDRESS); return; diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java index 49c16ad96eb7..a7be657ae7a3 100644 --- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java +++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java @@ -20,10 +20,10 @@ import static android.system.OsConstants.*; import android.annotation.NonNull; import android.annotation.Nullable; +import android.net.InetAddresses; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.Network; -import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.TrafficStats; import android.net.shared.PrivateDnsConfig; @@ -97,8 +97,8 @@ import javax.net.ssl.SSLSocketFactory; public class NetworkDiagnostics { private static final String TAG = "NetworkDiagnostics"; - private static final InetAddress TEST_DNS4 = NetworkUtils.numericToInetAddress("8.8.8.8"); - private static final InetAddress TEST_DNS6 = NetworkUtils.numericToInetAddress( + private static final InetAddress TEST_DNS4 = InetAddresses.parseNumericAddress("8.8.8.8"); + private static final InetAddress TEST_DNS6 = InetAddresses.parseNumericAddress( "2001:4860:4860::8888"); // For brevity elsewhere. diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index f0bf5c0975f2..9c5abd4706a3 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java @@ -16,11 +16,11 @@ package com.android.server.net; +import android.net.InetAddresses; import android.net.IpConfiguration; import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; -import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.RouteInfo; import android.net.StaticIpConfiguration; @@ -284,8 +284,10 @@ public class IpConfigStore { } else if (key.equals(IP_ASSIGNMENT_KEY)) { ipAssignment = IpAssignment.valueOf(in.readUTF()); } else if (key.equals(LINK_ADDRESS_KEY)) { - LinkAddress linkAddr = new LinkAddress( - NetworkUtils.numericToInetAddress(in.readUTF()), in.readInt()); + LinkAddress linkAddr = + new LinkAddress( + InetAddresses.parseNumericAddress(in.readUTF()), + in.readInt()); if (linkAddr.getAddress() instanceof Inet4Address && staticIpConfiguration.ipAddress == null) { staticIpConfiguration.ipAddress = linkAddr; @@ -297,7 +299,7 @@ public class IpConfigStore { InetAddress gateway = null; if (version == 1) { // only supported default gateways - leave the dest/prefix empty - gateway = NetworkUtils.numericToInetAddress(in.readUTF()); + gateway = InetAddresses.parseNumericAddress(in.readUTF()); if (staticIpConfiguration.gateway == null) { staticIpConfiguration.gateway = gateway; } else { @@ -305,12 +307,13 @@ public class IpConfigStore { } } else { if (in.readInt() == 1) { - dest = new LinkAddress( - NetworkUtils.numericToInetAddress(in.readUTF()), - in.readInt()); + dest = + new LinkAddress( + InetAddresses.parseNumericAddress(in.readUTF()), + in.readInt()); } if (in.readInt() == 1) { - gateway = NetworkUtils.numericToInetAddress(in.readUTF()); + gateway = InetAddresses.parseNumericAddress(in.readUTF()); } RouteInfo route = new RouteInfo(dest, gateway); if (route.isIPv4Default() && @@ -322,7 +325,7 @@ public class IpConfigStore { } } else if (key.equals(DNS_KEY)) { staticIpConfiguration.dnsServers.add( - NetworkUtils.numericToInetAddress(in.readUTF())); + InetAddresses.parseNumericAddress(in.readUTF())); } else if (key.equals(PROXY_SETTINGS_KEY)) { proxySettings = ProxySettings.valueOf(in.readUTF()); } else if (key.equals(PROXY_HOST_KEY)) { diff --git a/services/tests/servicestests/src/com/android/server/net/IpConfigStoreTest.java b/services/tests/servicestests/src/com/android/server/net/IpConfigStoreTest.java index 7767a2810ac2..9d300a611374 100644 --- a/services/tests/servicestests/src/com/android/server/net/IpConfigStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/net/IpConfigStoreTest.java @@ -20,11 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import android.net.InetAddresses; import android.net.IpConfiguration; import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; -import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.StaticIpConfiguration; import android.util.ArrayMap; @@ -79,8 +79,8 @@ public class IpConfigStoreTest { StaticIpConfiguration staticIpConfiguration = new StaticIpConfiguration(); staticIpConfiguration.ipAddress = new LinkAddress(IP_ADDR_1); - staticIpConfiguration.dnsServers.add(NetworkUtils.numericToInetAddress(DNS_IP_ADDR_1)); - staticIpConfiguration.dnsServers.add(NetworkUtils.numericToInetAddress(DNS_IP_ADDR_2)); + staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_1)); + staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_2)); ProxyInfo proxyInfo = new ProxyInfo("10.10.10.10", 88, "host1,host2"); diff --git a/tests/net/common/java/android/net/LinkAddressTest.java b/tests/net/common/java/android/net/LinkAddressTest.java index 60308e32b88d..1eaf30c5e068 100644 --- a/tests/net/common/java/android/net/LinkAddressTest.java +++ b/tests/net/common/java/android/net/LinkAddressTest.java @@ -68,8 +68,8 @@ public class LinkAddressTest { private static final String V4 = "192.0.2.1"; private static final String V6 = "2001:db8::1"; - private static final InetAddress V4_ADDRESS = NetworkUtils.numericToInetAddress(V4); - private static final InetAddress V6_ADDRESS = NetworkUtils.numericToInetAddress(V6); + private static final InetAddress V4_ADDRESS = InetAddresses.parseNumericAddress(V4); + private static final InetAddress V6_ADDRESS = InetAddresses.parseNumericAddress(V6); @Test public void testConstants() { @@ -131,10 +131,10 @@ public class LinkAddressTest { ipv6Loopback = new LinkAddress(addrs.get(0)); } - assertEquals(NetworkUtils.numericToInetAddress("127.0.0.1"), ipv4Loopback.getAddress()); + assertEquals(InetAddresses.parseNumericAddress("127.0.0.1"), ipv4Loopback.getAddress()); assertEquals(8, ipv4Loopback.getPrefixLength()); - assertEquals(NetworkUtils.numericToInetAddress("::1"), ipv6Loopback.getAddress()); + assertEquals(InetAddresses.parseNumericAddress("::1"), ipv6Loopback.getAddress()); assertEquals(128, ipv6Loopback.getPrefixLength()); // Null addresses are rejected. diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 34b26789b797..6dfa3b2b287b 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -181,7 +181,6 @@ import android.net.NetworkStack; import android.net.NetworkStackClient; import android.net.NetworkState; import android.net.NetworkTestResultParcelable; -import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.ResolverParamsParcel; import android.net.RouteInfo; @@ -4841,7 +4840,7 @@ public class ConnectivityServiceTest { lp.setInterfaceName(WIFI_IFNAME); LinkAddress myIpv4Address = new LinkAddress("192.168.12.3/24"); RouteInfo myIpv4DefaultRoute = new RouteInfo((IpPrefix) null, - NetworkUtils.numericToInetAddress("192.168.12.1"), lp.getInterfaceName()); + InetAddresses.parseNumericAddress("192.168.12.1"), lp.getInterfaceName()); lp.addLinkAddress(myIpv4Address); lp.addRoute(myIpv4DefaultRoute); diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 529d03c520ba..799bcc82d2a9 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -34,6 +34,7 @@ import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; import android.net.INetd; +import android.net.InetAddresses; import android.net.IpSecAlgorithm; import android.net.IpSecConfig; import android.net.IpSecManager; @@ -44,7 +45,6 @@ import android.net.IpSecTunnelInterfaceResponse; import android.net.IpSecUdpEncapResponse; import android.net.LinkAddress; import android.net.Network; -import android.net.NetworkUtils; import android.os.Binder; import android.os.INetworkManagementService; import android.os.ParcelFileDescriptor; @@ -272,7 +272,7 @@ public class IpSecServiceParameterizedTest { IpSecSpiResponse spi = mIpSecService.allocateSecurityParameterIndex( - NetworkUtils.numericToInetAddress(remoteAddress).getHostAddress(), + InetAddresses.parseNumericAddress(remoteAddress).getHostAddress(), IpSecManager.INVALID_SECURITY_PARAMETER_INDEX, new Binder()); return spi.resourceId; |