LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clarify documentation on TEMP_NOT_METERED API" am: ca4f15b079 am: 783560bffd am: de759e0ebe am: b236e66cfc

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

Change-Id: Ibfc36bfcf1550cd27ff5449d5dbd7ee34c9937c7
This commit is contained in:
Sarah Chin
2020-11-19 19:30:04 +00:00
committed by Automerger Merge Worker
parent cecb2bfcf4 b236e66cfc
commit f091281698
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/NetworkCapabilities.java
View File

@@ -339,10 +339,14 @@ public final class NetworkCapabilities implements Parcelable {
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
* 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.
* 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;
@@ -370,8 +374,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_TEMPORARILY_NOT_METERED));
| (1 << NET_CAPABILITY_PARTIAL_CONNECTIVITY)
| (1 << NET_CAPABILITY_TEMPORARILY_NOT_METERED);
/**
* Network capabilities that are not allowed in NetworkRequests. This exists because the