Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Emphasize possibility of multiple networks with same transport" am: f9c9dba0fb am: 9e29893e5a am: dfedef0c98

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

Change-Id: I8417a8af1202c01803c61ff54363b45960af6965
This commit is contained in:
David Su
2021-05-11 17:04:48 +00:00
committed by Automerger Merge Worker
parent 3266b6970c dfedef0c98
commit e9be280327
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Connectivity/framework/src/android/net/NetworkCapabilities.java
View File

@@ -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