| commit | a7472710a5c3af9bb808150779b9a62c59634506 | [log] [tgz] |
|---|---|---|
| author | David Su <dysu@google.com> | Tue May 11 16:10:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 16:10:55 2021 +0000 |
| tree | b9c4d6e2643e0a6354e8081a9f79e09502963f5f | |
| parent | 7f55a7d6a3ec3814929a57fc940519d09ad88920 [diff] | |
| parent | 74adc3a813284a1e60e150d47ab8d29106d6676f [diff] |
Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459 Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
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