From 82d1b93dfd35f8d0b740959f326313542ae17b8e Mon Sep 17 00:00:00 2001 From: James Mattis Date: Fri, 6 Nov 2020 13:31:26 -0800 Subject: [PATCH] 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 --- core/java/android/net/OemNetworkPreferences.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/OemNetworkPreferences.java b/core/java/android/net/OemNetworkPreferences.java index 07789433fb..6a8e3f9c01 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;