diff --git a/api/14.txt b/api/14.txt index e26311f428821..92969f6ee99f6 100644 --- a/api/14.txt +++ b/api/14.txt @@ -11541,7 +11541,6 @@ package android.net { public class ConnectivityManager { method public android.net.NetworkInfo getActiveNetworkInfo(); - method public android.net.NetworkQuotaInfo getActiveNetworkQuotaInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo(); method public deprecated boolean getBackgroundDataSetting(); method public android.net.NetworkInfo getNetworkInfo(int); @@ -11701,16 +11700,6 @@ package android.net { enum_constant public static final android.net.NetworkInfo.State UNKNOWN; } - public class NetworkQuotaInfo implements android.os.Parcelable { - method public int describeContents(); - method public long getEstimatedBytes(); - method public long getHardLimitBytes(); - method public long getSoftLimitBytes(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final long NO_LIMIT = -1L; // 0xffffffffffffffffL - } - public class ParseException extends java.lang.RuntimeException { field public java.lang.String response; } diff --git a/api/current.txt b/api/current.txt index 233854c298fad..db1c361602c32 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11556,7 +11556,6 @@ package android.net { public class ConnectivityManager { method public android.net.NetworkInfo getActiveNetworkInfo(); - method public android.net.NetworkQuotaInfo getActiveNetworkQuotaInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo(); method public deprecated boolean getBackgroundDataSetting(); method public android.net.NetworkInfo getNetworkInfo(int); @@ -11716,16 +11715,6 @@ package android.net { enum_constant public static final android.net.NetworkInfo.State UNKNOWN; } - public class NetworkQuotaInfo implements android.os.Parcelable { - method public int describeContents(); - method public long getEstimatedBytes(); - method public long getHardLimitBytes(); - method public long getSoftLimitBytes(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final long NO_LIMIT = -1L; // 0xffffffffffffffffL - } - public class ParseException extends java.lang.RuntimeException { field public java.lang.String response; } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 530122c3b2e47..e2d5af05878af 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -548,6 +548,8 @@ public class ConnectivityManager { * Return quota status for the current active network, or {@code null} if no * network is active. Quota status can change rapidly, so these values * shouldn't be cached. + * + * @hide */ public NetworkQuotaInfo getActiveNetworkQuotaInfo() { try { diff --git a/core/java/android/net/NetworkQuotaInfo.java b/core/java/android/net/NetworkQuotaInfo.java index b85f925944402..6535256efdde2 100644 --- a/core/java/android/net/NetworkQuotaInfo.java +++ b/core/java/android/net/NetworkQuotaInfo.java @@ -21,6 +21,8 @@ import android.os.Parcelable; /** * Information about quota status on a specific network. + * + * @hide */ public class NetworkQuotaInfo implements Parcelable { private final long mEstimatedBytes;