summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yan Yan <evitayan@google.com> 2022-01-24 19:27:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-24 19:27:11 +0000
commit59bb050977fbbb550ee54e4d8a4c80c0de25b887 (patch)
tree6c91aaf054dcbf5ee81371dd29a2d2936162b6d1
parentb92748937fa98fade65d93d910959d971d38ba04 (diff)
parente6286ba332044cb100270d203f32343734113e75 (diff)
Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490 Change-Id: I7d88ec6377f5bf1972d8a981a005ab4aa69982ae
-rw-r--r--core/java/android/net/vcn/VcnGatewayConnectionConfig.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
index a6830b708c31..2339656979b5 100644
--- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
+++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
@@ -549,8 +549,8 @@ public final class VcnGatewayConnectionConfig {
* networks, a network will be chosen arbitrarily amongst the networks matching the highest
* priority rule.
*
- * <p>If all networks fail to match the rules provided, an underlying network will still be
- * selected (at random if necessary).
+ * <p>If all networks fail to match the rules provided, a carrier-owned underlying network
+ * will still be selected (if available, at random if necessary).
*
* @param underlyingNetworkTemplates a list of unique VcnUnderlyingNetworkTemplates that are
* ordered from most to least preferred, or an empty list to use the default