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

Commit de8b8c39 authored by Jack Yu's avatar Jack Yu Committed by Sarah Chin
Browse files

Added a new capability for temporarily unmetered network. 

Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21
Merged-In: I10e26cb0852e67f614e7b9c4e49f95e078602e21
parent f1e3232b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29175,6 +29175,7 @@ package android.net { 
    field public static final int NET_CAPABILITY_NOT_VPN = 15; // 0xf

    field public static final int NET_CAPABILITY_RCS = 8; // 0x8

    field public static final int NET_CAPABILITY_SUPL = 1; // 0x1

    field public static final int NET_CAPABILITY_TEMPORARILY_NOT_METERED = 25; // 0x19

    field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe

    field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10

    field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6

core/java/android/net/NetworkCapabilities.java

+14 −2
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public final class NetworkCapabilities implements Parcelable { 
            NET_CAPABILITY_OEM_PAID,

            NET_CAPABILITY_MCX,

            NET_CAPABILITY_PARTIAL_CONNECTIVITY,

            NET_CAPABILITY_TEMPORARILY_NOT_METERED,

    })

    public @interface NetCapability { }
@@ -336,8 +337,16 @@ public final class NetworkCapabilities implements Parcelable { 
    @SystemApi

    public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24;



    /**

     * 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

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

     * that should not occur on a metered network.

     */

    public static final int NET_CAPABILITY_TEMPORARILY_NOT_METERED = 25;



    private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;

    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_PARTIAL_CONNECTIVITY;

    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_TEMPORARILY_NOT_METERED;



    /**

     * Network capabilities that are expected to be mutable, i.e., can change while a particular
@@ -353,7 +362,8 @@ public final class NetworkCapabilities implements Parcelable { 
            | (1 << NET_CAPABILITY_FOREGROUND)

            | (1 << NET_CAPABILITY_NOT_CONGESTED)

            | (1 << NET_CAPABILITY_NOT_SUSPENDED)

            | (1 << NET_CAPABILITY_PARTIAL_CONNECTIVITY);

            | (1 << NET_CAPABILITY_PARTIAL_CONNECTIVITY

            | (1 << NET_CAPABILITY_TEMPORARILY_NOT_METERED));



    /**

     * Network capabilities that are not allowed in NetworkRequests. This exists because the
@@ -424,6 +434,7 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    private static final long TEST_NETWORKS_ALLOWED_CAPABILITIES =

            (1 << NET_CAPABILITY_NOT_METERED)

            | (1 << NET_CAPABILITY_TEMPORARILY_NOT_METERED)

            | (1 << NET_CAPABILITY_NOT_RESTRICTED)

            | (1 << NET_CAPABILITY_NOT_VPN)

            | (1 << NET_CAPABILITY_NOT_ROAMING)
@@ -1866,6 +1877,7 @@ public final class NetworkCapabilities implements Parcelable { 
            case NET_CAPABILITY_OEM_PAID:             return "OEM_PAID";

            case NET_CAPABILITY_MCX:                  return "MCX";

            case NET_CAPABILITY_PARTIAL_CONNECTIVITY: return "PARTIAL_CONNECTIVITY";

            case NET_CAPABILITY_TEMPORARILY_NOT_METERED:    return "TEMPORARILY_NOT_METERED";

            default:                                  return Integer.toString(capability);

        }

    }