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

Commit a50d0f89 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Hide quota APIs until finalized." into ics-factoryrom

parents 2fc826ec 44a3e0d4

api/14.txt

+0 −11
Original line number Diff line number Diff line
@@ -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;















  }

























api/current.txt



+0
−11




























Original line number
Diff line number
Diff line








@@ -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;















  }

























core/java/android/net/ConnectivityManager.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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 {

































core/java/android/net/NetworkQuotaInfo.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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;