Merge "Change the const for the unreachable network" am: 07ff79a595 am: 5522ed6e3c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190

Change-Id: I848bc411f919991eb795372b64023f951e310e6a
This commit is contained in:
James Mattis
2021-03-31 03:40:16 +00:00
committed by Automerger Merge Worker

View File

@@ -6296,8 +6296,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Request used to optionally keep vehicle internal network always active // Request used to optionally keep vehicle internal network always active
private final NetworkRequest mDefaultVehicleRequest; private final NetworkRequest mDefaultVehicleRequest;
// TODO replace with INetd.DUMMY_NET_ID when available. // TODO replace with INetd.UNREACHABLE_NET_ID when available.
private static final int NO_SERVICE_NET_ID = 51; 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 // 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 // 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 // ever return the associated network. For this reason, this NAI is not in the list of available