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

Merge "[Mainline] Core Platform APIs migration"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-06 04:11:00 +00:00
committed by Gerrit Code Review
parent ca0b4f05f3 0f518938b8
commit 1b9888440e
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2030,7 +2030,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mHandler.sendMessage(mHandler.obtainMessage( mHandler.sendMessage(mHandler.obtainMessage(
EVENT_PRIVATE_DNS_VALIDATION_UPDATE, EVENT_PRIVATE_DNS_VALIDATION_UPDATE,
new PrivateDnsValidationUpdate(netId, new PrivateDnsValidationUpdate(netId,
InetAddress.parseNumericAddress(ipAddress), InetAddresses.parseNumericAddress(ipAddress),
hostname, validated))); hostname, validated)));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
loge("Error parsing ip address in validation event"); loge("Error parsing ip address in validation event");

7
services/core/java/com/android/server/TestNetworkService.java
View File

@@ -50,6 +50,7 @@ import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.net.module.util.NetdUtils; import com.android.net.module.util.NetdUtils;
import com.android.net.module.util.NetworkStackConstants;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.net.Inet4Address; import java.net.Inet4Address;
@@ -280,10 +281,12 @@ class TestNetworkService extends ITestNetworkManager.Stub {
// Add global routes (but as non-default, non-internet providing network) // Add global routes (but as non-default, non-internet providing network)
if (allowIPv4) { if (allowIPv4) {
lp.addRoute(new RouteInfo(new IpPrefix(Inet4Address.ANY, 0), null, iface)); lp.addRoute(new RouteInfo(new IpPrefix(
NetworkStackConstants.IPV4_ADDR_ANY, 0), null, iface));
} }
if (allowIPv6) { if (allowIPv6) {
lp.addRoute(new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), null, iface)); lp.addRoute(new RouteInfo(new IpPrefix(
NetworkStackConstants.IPV6_ADDR_ANY, 0), null, iface));
} }
final TestNetworkAgent agent = new TestNetworkAgent(context, looper, nc, lp, final TestNetworkAgent agent = new TestNetworkAgent(context, looper, nc, lp,

3
services/core/java/com/android/server/connectivity/DnsManager.java
View File

@@ -32,6 +32,7 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.IDnsResolver; import android.net.IDnsResolver;
import android.net.InetAddresses;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.ResolverOptionsParcel; import android.net.ResolverOptionsParcel;
@@ -190,7 +191,7 @@ public class DnsManager {
for (String ipAddress : ipAddresses) { for (String ipAddress : ipAddresses) {
try { try {
latestDnses.add(new Pair(hostname, latestDnses.add(new Pair(hostname,
InetAddress.parseNumericAddress(ipAddress))); InetAddresses.parseNumericAddress(ipAddress)));
} catch (IllegalArgumentException e) {} } catch (IllegalArgumentException e) {}
} }
// Remove <hostname, ipAddress> pairs that should not be tracked. // Remove <hostname, ipAddress> pairs that should not be tracked.

4
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -34,9 +34,9 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.net.module.util.NetworkStackConstants;
import com.android.server.net.BaseNetworkObserver; import com.android.server.net.BaseNetworkObserver;
import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.util.Objects; import java.util.Objects;
@@ -433,7 +433,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
// clat IPv4 address itself (for those apps, it doesn't matter what // clat IPv4 address itself (for those apps, it doesn't matter what
// the IP of the gateway is, only that there is one). // the IP of the gateway is, only that there is one).
RouteInfo ipv4Default = new RouteInfo( RouteInfo ipv4Default = new RouteInfo(
new LinkAddress(Inet4Address.ANY, 0), new LinkAddress(NetworkStackConstants.IPV4_ADDR_ANY, 0),
clatAddress.getAddress(), mIface); clatAddress.getAddress(), mIface);
stacked.addRoute(ipv4Default); stacked.addRoute(ipv4Default);
stacked.addLinkAddress(clatAddress); stacked.addLinkAddress(clatAddress);