Merge "APIs to disable data usage notifications." into pi-dev

am: d6e54408bd Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
parent 7b0fb3fa55 d6e54408bd
commit d43f738892
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -254,9 +254,8 @@ public final class NetworkCapabilities implements Parcelable {
    /**
     * Indicates that this network is not congested.
     * <p>
-     * When a network is congested, the device should defer network traffic that
-     * can be done at a later time without breaking developer contracts.
-     * @hide
+     * When a network is congested, applications should defer network traffic
+     * that can be done at a later time, such as uploading analytics.
     */
    public static final int NET_CAPABILITY_NOT_CONGESTED = 20;