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

Commit 0e6d0931 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:... 

Merge "Emphasize possibility of multiple networks with same transport" am: f9c9dba0 am: 9e29893e am: dfedef0c am: e9be2803

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

Change-Id: Ic55592c91406dd4e83b346fbb4d55512fb03620d
parents 635035e4 e9be2803

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

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