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

Merge "Updating network preference comments" am: fa3f7a3366 am: 1def8c4eb2 am: 75f5d528f6

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

Change-Id: I2cd6b804cdadfce11d298c32a29ba0c1f9820209
This commit is contained in:
James Mattis
2020-11-10 19:33:34 +00:00
committed by Automerger Merge Worker
parent f7cf9a31e8 75f5d528f6
commit a9a9fbc5cd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/OemNetworkPreferences.java
View File

@@ -36,12 +36,16 @@ public final class OemNetworkPreferences implements Parcelable {
public static final int OEM_NETWORK_PREFERENCE_DEFAULT = 0; 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; 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; public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2;