diff options
| author | 2021-05-11 15:51:28 +0000 | |
|---|---|---|
| committer | 2021-05-11 15:51:28 +0000 | |
| commit | f9c9dba0fb163e29b176ba2234b7704d149016dc (patch) | |
| tree | 220178b73da2548160b0a4823a264b61a60fa4df | |
| parent | 46dff8e09fea14dac3e82e5f781fa49766b9a035 (diff) | |
| parent | 31bace15a5b5c3a9b22cf796e8c341df1e307852 (diff) | |
Merge "Emphasize possibility of multiple networks with same transport"
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkCapabilities.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java index 937a9d23933c..950b1c769514 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java +++ b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java @@ -2444,7 +2444,8 @@ public final class NetworkCapabilities implements Parcelable { * For example {@code TRANSPORT_WIFI} and {@code TRANSPORT_ETHERNET} added to a * {@code NetworkCapabilities} would cause either a Wi-Fi network or an Ethernet network * to be selected. This is logically different than - * {@code NetworkCapabilities.NET_CAPABILITY_*}. + * {@code NetworkCapabilities.NET_CAPABILITY_*}. Also note that multiple networks with the + * same transport type may be active concurrently. * * @param transportType the transport type to be added or removed. * @return this builder |