joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 am: 25dfe8eb37

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
commit f2ba675a29
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;
/**
* 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;