Merge "Emphasize possibility of multiple networks with same transport" am: cf514f511d am: ee28d79784

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826
This commit is contained in:
David Su
2021-05-11 16:48:03 +00:00
committed by Automerger Merge Worker

View File

@@ -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