commit 0d942e81c786e45464bd9ad6a52f40cd742e3221
author Lorenzo Colitti <lorenzo@google.com> Wed May 12 09:00:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 12 09:00:17 2021 +0000
tree 4b59191a8932d85069543cfc4e33a9aa883c223c
parent cf514f511d5d9d1af11f927f75f229206cd5f6bf
parent 395fafb54fa873af780d1d29f69d5ec1f906cf9f

Merge "Rename unwanted capabilities to forbidden capabilities."

framework/src/android/net/NetworkCapabilities.java

diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index 5d3eaaf..de77755 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