Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e29893e authored by David Su's avatar David Su Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
parents 8f1928f4 f9c9dba0

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+2 −1
Original line number Diff line number Diff line
@@ -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