Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[SP31] Expose onSetWarningAndLimit System API"

Browse Source
This commit is contained in:
Junyu Lai
2021-03-30 08:00:45 +00:00
committed by Gerrit Code Review
parent 3eee37a29d 59b0a621e7
commit 3757df2e7d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -6443,9 +6443,11 @@ package android.net.netstats.provider {
method public void notifyAlertReached(); method public void notifyAlertReached();
method public void notifyLimitReached(); method public void notifyLimitReached();
method public void notifyStatsUpdated(int, @NonNull android.net.NetworkStats, @NonNull android.net.NetworkStats); method public void notifyStatsUpdated(int, @NonNull android.net.NetworkStats, @NonNull android.net.NetworkStats);
method public void notifyWarningReached();
method public abstract void onRequestStatsUpdate(int); method public abstract void onRequestStatsUpdate(int);
method public abstract void onSetAlert(long); method public abstract void onSetAlert(long);
method public abstract void onSetLimit(@NonNull String, long); method public abstract void onSetLimit(@NonNull String, long);
method public void onSetWarningAndLimit(@NonNull String, long, long);
field public static final int QUOTA_UNLIMITED = -1; // 0xffffffff field public static final int QUOTA_UNLIMITED = -1; // 0xffffffff
} }

7
core/java/android/net/netstats/provider/NetworkStatsProvider.java
View File

@@ -147,10 +147,7 @@ public abstract class NetworkStatsProvider {
/** /**
* Notify system that the warning set by {@link #onSetWarningAndLimit} has been reached. * Notify system that the warning set by {@link #onSetWarningAndLimit} has been reached.
*
* @hide
*/ */
// TODO: Expose as system API.
public void notifyWarningReached() { public void notifyWarningReached() {
try { try {
// Reuse the code path to notify warning reached with limit reached // Reuse the code path to notify warning reached with limit reached
@@ -198,7 +195,6 @@ public abstract class NetworkStatsProvider {
* @param quotaBytes the quota defined as the number of bytes, starting from zero and counting * @param quotaBytes the quota defined as the number of bytes, starting from zero and counting
* from now. A value of {@link #QUOTA_UNLIMITED} indicates there is no limit. * from now. A value of {@link #QUOTA_UNLIMITED} indicates there is no limit.
*/ */
// TODO: deprecate this once onSetWarningAndLimit is ready.
public abstract void onSetLimit(@NonNull String iface, long quotaBytes); public abstract void onSetLimit(@NonNull String iface, long quotaBytes);
/** /**
@@ -217,10 +213,7 @@ public abstract class NetworkStatsProvider {
* there is no warning. * there is no warning.
* @param limitBytes the limit defined as the number of bytes, starting from zero and counting * @param limitBytes the limit defined as the number of bytes, starting from zero and counting
* from now. A value of {@link #QUOTA_UNLIMITED} indicates there is no limit. * from now. A value of {@link #QUOTA_UNLIMITED} indicates there is no limit.
*
* @hide
*/ */
// TODO: Expose as system API.
public void onSetWarningAndLimit(@NonNull String iface, long warningBytes, long limitBytes) { public void onSetWarningAndLimit(@NonNull String iface, long warningBytes, long limitBytes) {
// Backward compatibility for those who didn't override this function. // Backward compatibility for those who didn't override this function.
onSetLimit(iface, limitBytes); onSetLimit(iface, limitBytes);