summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Mattis <jmattis@google.com> 2020-11-06 13:31:26 -0800
committer James Mattis <jmattis@google.com> 2020-11-09 21:06:09 -0800
commit2d4b26e43a107c903a4910f23f169563c93d24c0 (patch)
tree27bcb5a584c9c41a1a1ae643e38fcc87b7cfe0d2
parentef2c66e72f90eff8beb01313ba1cf873f3c3de21 (diff)
Updating network preference comments
Updating comments for network preferences to better clarify that preferences which include more than one network type will then rely on scoring to determine which of those networks are chosen. Bug: 171795464 Test: atest FrameworksNetTests Change-Id: I9eb5683f2cd69281bbee9fb70028d45f07720914
-rw-r--r--core/java/android/net/OemNetworkPreferences.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/net/OemNetworkPreferences.java b/core/java/android/net/OemNetworkPreferences.java
index 07789433fbe7..6a8e3f9c01f2 100644
--- a/core/java/android/net/OemNetworkPreferences.java
+++ b/core/java/android/net/OemNetworkPreferences.java
@@ -36,12 +36,16 @@ public final class OemNetworkPreferences implements Parcelable {
public static final int OEM_NETWORK_PREFERENCE_DEFAULT = 0;
/**
- * Prefer networks in order: NET_CAPABILITY_NOT_METERED, NET_CAPABILITY_OEM_PAID, default.
+ * If an unmetered network is available, use it.
+ * Otherwise, if a network with the OEM_PAID capability is available, use it.
+ * Otherwise, use the general default network.
*/
public static final int OEM_NETWORK_PREFERENCE_OEM_PAID = 1;
/**
- * Prefer networks in order: NET_CAPABILITY_NOT_METERED, NET_CAPABILITY_OEM_PAID.
+ * If an unmetered network is available, use it.
+ * Otherwise, if a network with the OEM_PAID capability is available, use it.
+ * Otherwise, the app doesn't get a network.
*/
public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2;