diff options
| author | 2021-02-02 15:58:36 +0000 | |
|---|---|---|
| committer | 2021-02-02 15:58:36 +0000 | |
| commit | 88736d70bd5f345d59f90a814c67177070da6c62 (patch) | |
| tree | 27b52bb3ed4fe1561935a2be1f930981d49707dd | |
| parent | dc22edcddb261a568faa154f537c0607726f061d (diff) | |
| parent | b57e9b2dccb138540ff3f0d8b765e69b30f9f7d2 (diff) | |
Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c9b am: 2562ab4856 am: b57e9b2dcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I932566b4bb788925072e57436cd5f5fa7918a32c
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkCapabilities.java | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 1d13b73b7020..b748b918d1c6 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7281,6 +7281,7 @@ package android.net { method @Nullable public String getSsid(); method @NonNull public int[] getTransportTypes(); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); + field public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28; // 0x1c field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16 field public static final int NET_CAPABILITY_OEM_PRIVATE = 26; // 0x1a field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18 diff --git a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java index 0832152d6ab6..8bfa77acd36d 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java +++ b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java @@ -401,11 +401,18 @@ public final class NetworkCapabilities implements Parcelable { public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27; /** - * Indicates that this network is not managed by a Virtual Carrier Network (VCN). - * - * TODO(b/177299683): Add additional clarifying javadoc. + * Indicates that this network is not subsumed by a Virtual Carrier Network (VCN). + * <p> + * To provide an experience on a VCN similar to a single traditional carrier network, in + * some cases the system sets this bit is set by default in application's network requests, + * and may choose to remove it at its own discretion when matching the request to a network. + * <p> + * Applications that want to know about a Virtual Carrier Network's underlying networks, + * for example to use them for multipath purposes, should remove this bit from their network + * requests ; the system will not add it back once removed. * @hide */ + @SystemApi public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28; private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS; |