| commit | b8e4a7b1e7721162a1d87b8f37250fbeee935d04 | [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 | af7dfaf882e7eaf5364700faa973e9380124abb8 | |
| parent | 276e973b32a645dae128213e8f4fd2ab839a045c [diff] | |
| parent | 32cee1bf1b90a9cb35b5a0f37bc8b9f99d7e11f1 [diff] |
Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d am: ee28d79784 am: 32cee1bf1b 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