drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2011-10-06 11:19:29 -07:00
committed by Android (Google) Code Review
parent 2fc826ec94 44a3e0d497
commit a50d0f8985
4 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/14.txt
View File

@ -11541,7 +11541,6 @@ package android.net {
public class ConnectivityManager { public class ConnectivityManager {
method public android.net.NetworkInfo getActiveNetworkInfo(); method public android.net.NetworkInfo getActiveNetworkInfo();
method public android.net.NetworkQuotaInfo getActiveNetworkQuotaInfo();
method public android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo();
method public deprecated boolean getBackgroundDataSetting(); method public deprecated boolean getBackgroundDataSetting();
method public android.net.NetworkInfo getNetworkInfo(int); method public android.net.NetworkInfo getNetworkInfo(int);
@ -11701,16 +11700,6 @@ package android.net {
enum_constant public static final android.net.NetworkInfo.State UNKNOWN; 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 { public class ParseException extends java.lang.RuntimeException {
field public java.lang.String response; field public java.lang.String response;
} }

11
api/current.txt
View File

@ -11541,7 +11541,6 @@ package android.net {
public class ConnectivityManager { public class ConnectivityManager {
method public android.net.NetworkInfo getActiveNetworkInfo(); method public android.net.NetworkInfo getActiveNetworkInfo();
method public android.net.NetworkQuotaInfo getActiveNetworkQuotaInfo();
method public android.net.NetworkInfo[] getAllNetworkInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo();
method public deprecated boolean getBackgroundDataSetting(); method public deprecated boolean getBackgroundDataSetting();
method public android.net.NetworkInfo getNetworkInfo(int); method public android.net.NetworkInfo getNetworkInfo(int);
@ -11701,16 +11700,6 @@ package android.net {
enum_constant public static final android.net.NetworkInfo.State UNKNOWN; 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 { public class ParseException extends java.lang.RuntimeException {
field public java.lang.String response; field public java.lang.String response;
} }

2
core/java/android/net/ConnectivityManager.java
View File

@ -548,6 +548,8 @@ public class ConnectivityManager {
* Return quota status for the current active network, or {@code null} if no * Return quota status for the current active network, or {@code null} if no
* network is active. Quota status can change rapidly, so these values * network is active. Quota status can change rapidly, so these values
* shouldn't be cached. * shouldn't be cached.
*
* @hide
*/ */
public NetworkQuotaInfo getActiveNetworkQuotaInfo() { public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
try { try {

2
core/java/android/net/NetworkQuotaInfo.java
View File

@ -21,6 +21,8 @@ import android.os.Parcelable;
/** /**
* Information about quota status on a specific network. * Information about quota status on a specific network.
*
* @hide
*/ */
public class NetworkQuotaInfo implements Parcelable { public class NetworkQuotaInfo implements Parcelable {
private final long mEstimatedBytes; private final long mEstimatedBytes;