From d06a9004edefd250f7aa614efb714a40447ff7f5 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 4 Apr 2018 14:51:26 +0900 Subject: Do not register callback for < MIN_THRESHOLD_BYTES This also avoids returning a nonzero multipath preference if remaining data is low but nonzero. Bug: b/72877610 Change-Id: I2459ded06de77d284ae1fe81a60d9e1df56b0c26 Fixes: b/72877610 Test: Tests in go/ag/3842960 pass --- core/java/android/app/usage/NetworkStatsManager.java | 10 ++++++++++ .../server/connectivity/MultipathPolicyTracker.java | 19 +++++++++++++++---- .../com/android/server/net/NetworkStatsObservers.java | 4 +--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java index b2fe95869141..34f3a8da9524 100644 --- a/core/java/android/app/usage/NetworkStatsManager.java +++ b/core/java/android/app/usage/NetworkStatsManager.java @@ -35,6 +35,7 @@ import android.os.Messenger; import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceManager.ServiceNotFoundException; +import android.util.DataUnit; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -95,6 +96,15 @@ public class NetworkStatsManager { /** @hide */ public static final int CALLBACK_RELEASED = 1; + /** + * Minimum data usage threshold for registering usage callbacks. + * + * Requests registered with a threshold lower than this will only be triggered once this minimum + * is reached. + * @hide + */ + public static final long MIN_THRESHOLD_BYTES = DataUnit.MEBIBYTES.toBytes(2); + private final Context mContext; private final INetworkStatsService mService; diff --git a/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java b/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java index 3868ea6a1056..509894599e10 100644 --- a/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java +++ b/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java @@ -55,6 +55,7 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; import android.telephony.TelephonyManager; +import android.util.DataUnit; import android.util.DebugUtils; import android.util.Pair; import android.util.Slog; @@ -323,11 +324,11 @@ public class MultipathPolicyTracker { if (DBG) Slog.d(TAG, "Setting quota: " + quota + " bytes"); } + // TODO: re-register if day changed: budget may have run out but should be refreshed. if (haveMultipathBudget() && quota == mQuota) { - // If we already have a usage callback pending , there's no need to re-register it + // If there is already a usage callback pending , there's no need to re-register it // if the quota hasn't changed. The callback will simply fire as expected when the - // budget is spent. Also: if we re-register the callback when we're below the - // UsageCallback's minimum value of 2MB, we'll overshoot the budget. + // budget is spent. if (DBG) Slog.d(TAG, "Quota still " + quota + ", not updating."); return; } @@ -337,7 +338,17 @@ public class MultipathPolicyTracker { // ourselves any budget to work with. final long usage = getDailyNonDefaultDataUsage(); final long budget = (usage == -1) ? 0 : Math.max(0, quota - usage); - if (budget > 0) { + + // Only consider budgets greater than MIN_THRESHOLD_BYTES, otherwise the callback will + // fire late, after data usage went over budget. Also budget should be 0 if remaining + // data is close to 0. + // This is necessary because the usage callback does not accept smaller thresholds. + // Because it snaps everything to MIN_THRESHOLD_BYTES, the lesser of the two evils is + // to snap to 0 here. + // This will only be called if the total quota for the day changed, not if usage changed + // since last time, so even if this is called very often the budget will not snap to 0 + // as soon as there are less than 2MB left for today. + if (budget > NetworkStatsManager.MIN_THRESHOLD_BYTES) { if (DBG) Slog.d(TAG, "Setting callback for " + budget + " bytes on network " + network); registerUsageCallback(budget); diff --git a/services/core/java/com/android/server/net/NetworkStatsObservers.java b/services/core/java/com/android/server/net/NetworkStatsObservers.java index 741c2062bd57..d8408730dd25 100644 --- a/services/core/java/com/android/server/net/NetworkStatsObservers.java +++ b/services/core/java/com/android/server/net/NetworkStatsObservers.java @@ -16,7 +16,7 @@ package com.android.server.net; -import static android.net.TrafficStats.MB_IN_BYTES; +import static android.app.usage.NetworkStatsManager.MIN_THRESHOLD_BYTES; import static com.android.internal.util.Preconditions.checkArgument; @@ -52,8 +52,6 @@ class NetworkStatsObservers { private static final String TAG = "NetworkStatsObservers"; private static final boolean LOGV = false; - private static final long MIN_THRESHOLD_BYTES = 2 * MB_IN_BYTES; - private static final int MSG_REGISTER = 1; private static final int MSG_UNREGISTER = 2; private static final int MSG_UPDATE_STATS = 3; -- cgit v1.2.3-59-g8ed1b