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

Commit 2684b289 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Clarify documentation on TEMP_NOT_METERED API" am: 9e7ff9a1 am:... 

Merge "Clarify documentation on TEMP_NOT_METERED API" am: 9e7ff9a1 am: b6771dff am: 2e506764 am: 8698f3f4

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

Change-Id: Ibfc36bfcf1550cd27ff5449d5dbd7ee34c9937c7
parents 2c330aad 8698f3f4

core/java/android/net/NetworkCapabilities.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -339,10 +339,14 @@ public final class NetworkCapabilities implements Parcelable { 
    public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24;

    public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24;





    /**

    /**

     * Indicates that this network is temporarily unmetered.

     * <p>

     * This capability will be set for networks that are generally metered, but are currently

     * This capability will be set for networks that are generally metered, but are currently

     * unmetered, e.g., because the user is in a particular area. This capability can be changed at

     * unmetered, e.g., because the user is in a particular area. This capability can be changed at

     * any time. When it is removed, applications are responsible for stopping any data transfer

     * any time. When it is removed, applications are responsible for stopping any data transfer

     * that should not occur on a metered network.

     * that should not occur on a metered network.

     * Note that most apps should use {@link #NET_CAPABILITY_NOT_METERED} instead. For more

     * information, see https://developer.android.com/about/versions/11/features/5g#meteredness.

     */

     */

    public static final int NET_CAPABILITY_TEMPORARILY_NOT_METERED = 25;

    public static final int NET_CAPABILITY_TEMPORARILY_NOT_METERED = 25;
@@ -370,8 +374,8 @@ public final class NetworkCapabilities implements Parcelable { 
            | (1 << NET_CAPABILITY_FOREGROUND)

            | (1 << NET_CAPABILITY_FOREGROUND)

            | (1 << NET_CAPABILITY_NOT_CONGESTED)

            | (1 << NET_CAPABILITY_NOT_CONGESTED)

            | (1 << NET_CAPABILITY_NOT_SUSPENDED)

            | (1 << NET_CAPABILITY_NOT_SUSPENDED)

            | (1 << NET_CAPABILITY_PARTIAL_CONNECTIVITY

            | (1 << NET_CAPABILITY_PARTIAL_CONNECTIVITY)

            | (1 << NET_CAPABILITY_TEMPORARILY_NOT_METERED));

            | (1 << NET_CAPABILITY_TEMPORARILY_NOT_METERED);





    /**

    /**

     * Network capabilities that are not allowed in NetworkRequests. This exists because the

     * Network capabilities that are not allowed in NetworkRequests. This exists because the