Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1def8c4e authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Updating network preference comments" am: fa3f7a33 

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

Change-Id: I99561b2d7673c5f5f45ac793c453b4f10bd663e1
parents f49b8a3b fa3f7a33

core/java/android/net/OemNetworkPreferences.java

+6 −2
Original line number Diff line number Diff line
@@ -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;