summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-05-14 08:08:08 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-05-14 08:08:08 +0000
commitda4644daf7a7e61f5af3669d6aba9ff45fd5aca0 (patch)
tree2e347f39d89309b4b82c1c7593f1a881edfa390c
parente0316b60181526959bc6cd8ea5e5f545834c2f78 (diff)
parent1e8a69ec92eb8c49792a01db2b6cb37c9145a22c (diff)
Merge "Reference unreachable netId from INetd"
-rw-r--r--packages/Connectivity/service/src/com/android/server/ConnectivityService.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/Connectivity/service/src/com/android/server/ConnectivityService.java b/packages/Connectivity/service/src/com/android/server/ConnectivityService.java
index 7ffca45efedb..051a00bde43e 100644
--- a/packages/Connectivity/service/src/com/android/server/ConnectivityService.java
+++ b/packages/Connectivity/service/src/com/android/server/ConnectivityService.java
@@ -1394,7 +1394,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// arguments like the handler or the DnsResolver.
// TODO : remove thisĀ ; it is probably better handled with a sentinel request.
mNoServiceNetwork = new NetworkAgentInfo(null,
- new Network(NO_SERVICE_NET_ID),
+ new Network(INetd.UNREACHABLE_NET_ID),
new NetworkInfo(TYPE_NONE, 0, "", ""),
new LinkProperties(), new NetworkCapabilities(),
new NetworkScore.Builder().setLegacyInt(0).build(), mContext, null,
@@ -6488,8 +6488,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Request used to optionally keep vehicle internal network always active
private final NetworkRequest mDefaultVehicleRequest;
- // TODO replace with INetd.UNREACHABLE_NET_ID when available.
- private static final int NO_SERVICE_NET_ID = 52;
// Sentinel NAI used to direct apps with default networks that should have no connectivity to a
// network with no service. This NAI should never be matched against, nor should any public API
// ever return the associated network. For this reason, this NAI is not in the list of available