| commit | 318f23c5c8354295a29199c84ecc9211264a6287 | [log] [tgz] |
|---|---|---|
| author | David Su <dysu@google.com> | Tue May 11 17:04:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 17:04:48 2021 +0000 |
| tree | 45414927af3db88ee99513ac6bccd848158356ee | |
| parent | 1067c8227441121f51d4697f77d7625cf2024d0f [diff] | |
| parent | 197900e62eb3e34154bb77c33527e6362ec4f099 [diff] |
Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5 am: 197900e62e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459 Change-Id: I8417a8af1202c01803c61ff54363b45960af6965
diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 0bafd5b..3d6cc68 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -2461,7 +2461,8 @@ * 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