| commit | 0aa2f9f8ec752e1b9f92a01af53f05612dd38031 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Wed Mar 31 03:40:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 03:40:16 2021 +0000 |
| tree | 8c091149a68924270b9c3ee2e297db19f89e7f59 | |
| parent | e4ef990c5db78295d7ebd337f58d35ce111dc533 [diff] | |
| parent | 5522ed6e3c6f8ac0be649a37387ce8b87cc3e82a [diff] |
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
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 7ea3738..e3ce7a3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6296,8 +6296,8 @@ // Request used to optionally keep vehicle internal network always active private final NetworkRequest mDefaultVehicleRequest; - // TODO replace with INetd.DUMMY_NET_ID when available. - private static final int NO_SERVICE_NET_ID = 51; + // 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