diff options
| author | James Mattis <jmattis@google.com> | 2020-11-10 19:57:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 19:57:53 +0000 |
| commit | 8cc7994e0548b82dd557d9d5c0f06fd3a74026de (patch) | |
| tree | 8504281be749453f10eae5439b772fd46d240b8d /core/java | |
| parent | 53766bd74aba013370354ecb0fae498dea459005 (diff) | |
| parent | a9a9fbc5cdc116204e9807d839fc9301d8579e15 (diff) | |
Merge "Updating network preference comments" am: fa3f7a3366 am: 1def8c4eb2 am: 75f5d528f6 am: a9a9fbc5cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233
Change-Id: Ic1b025dd4598c211a3b9c5065e034b4cc001dc99
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/OemNetworkPreferences.java | 8 |
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; |