LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[Mainline Migration] Migrate NetworkUtils"

Browse Source
This commit is contained in:
Serik Beketayev
2020-12-09 23:47:05 +00:00
committed by Gerrit Code Review
parent 9157037502 754c5be0f7
commit 3422864269
7 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -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);

4
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -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;