| commit | cbb60163dfac7e07f177573dedf00a1cc63e761d | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Wed Mar 31 04:23:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 04:23:02 2021 +0000 |
| tree | 9eb946d88b0c28b311755e1762763b1ec06d5b90 | |
| parent | 5c88750cfce5c5c1e859368730b9522d8d5a3a21 [diff] | |
| parent | 0aa2f9f8ec752e1b9f92a01af53f05612dd38031 [diff] |
Merge "Change the const for the unreachable network" am: 07ff79a595 am: 5522ed6e3c am: 0aa2f9f8ec Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190 Change-Id: Id50d1e06f18830025eb30b420b4f6817028cf5c8
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index de3e122..f3e6428 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6326,8 +6326,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