Merge "[SP31] Expose onSetWarningAndLimit System API" (3757df2e) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6443,9 +6443,11 @@ package android.net.netstats.provider {
		method public void notifyAlertReached();
		method public void notifyLimitReached();
		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 onSetAlert(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
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -147,10 +147,7 @@ public abstract class NetworkStatsProvider {

		/**
		* Notify system that the warning set by {@link #onSetWarningAndLimit} has been reached.
		*
		* @hide
		*/
		// TODO: Expose as system API.
		public void notifyWarningReached() {
		try {
		// 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
		* 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);

		/**
		@@ -217,10 +213,7 @@ public abstract class NetworkStatsProvider {
		* there is no warning.
		* @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.
		*
		* @hide
		*/
		// TODO: Expose as system API.
		public void onSetWarningAndLimit(@NonNull String iface, long warningBytes, long limitBytes) {
		// Backward compatibility for those who didn't override this function.
		onSetLimit(iface, limitBytes);