| commit | 32cee1bf1b90a9cb35b5a0f37bc8b9f99d7e11f1 | [log] [tgz] |
|---|---|---|
| author | David Su <dysu@google.com> | Tue May 11 16:48:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 16:48:03 2021 +0000 |
| tree | 95aa73e19307af5edd84a22e05c01f771bb77e82 | |
| parent | efca123280bb2930ee58f68036d6459bf548850a [diff] | |
| parent | ee28d79784fa52b8c3ff557a22cead2d4f94c16f [diff] |
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
diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 937a9d2..950b1c7 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -2444,7 +2444,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