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

Merge "[MS77] Remove hidden api dependencies from MultipathPolicyTracker" am: 679c6dbedb am: 89ed0021b2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958894

Change-Id: Ia4f2a249446e6eff7e51d27aaeb89cf22d805520
This commit is contained in:
Junyu Lai
2022-01-26 17:51:08 +00:00
committed by Automerger Merge Worker
parent 72f991560c 89ed0021b2
commit 6453c3096b
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
View File

@@ -24,7 +24,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicy.WARNING_DISABLED; import static android.net.NetworkPolicy.WARNING_DISABLED;
import static android.net.NetworkTemplate.OEM_MANAGED_ALL;
import static android.provider.Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES; import static android.provider.Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES;
import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -94,6 +93,7 @@ public class MultipathPolicyTracker {
private static String TAG = MultipathPolicyTracker.class.getSimpleName(); private static String TAG = MultipathPolicyTracker.class.getSimpleName();
private static final boolean DBG = false; private static final boolean DBG = false;
private static final long MIN_THRESHOLD_BYTES = 2 * 1_048_576L; // 2MiB
// This context is for the current user. // This context is for the current user.
private final Context mContext; private final Context mContext;
@@ -278,15 +278,11 @@ public class MultipathPolicyTracker {
} }
private NetworkIdentity getTemplateMatchingNetworkIdentity(NetworkCapabilities nc) { private NetworkIdentity getTemplateMatchingNetworkIdentity(NetworkCapabilities nc) {
return new NetworkIdentity( return new NetworkIdentity.Builder().setType(ConnectivityManager.TYPE_MOBILE)
ConnectivityManager.TYPE_MOBILE, .setSubscriberId(subscriberId)
0 /* subType, unused for template matching */, .setRoaming(!nc.hasCapability(NET_CAPABILITY_NOT_ROAMING))
subscriberId, .setMetered(!nc.hasCapability(NET_CAPABILITY_NOT_METERED))
null /* networkId, unused for matching mobile networks */, .build();
!nc.hasCapability(NET_CAPABILITY_NOT_ROAMING),
!nc.hasCapability(NET_CAPABILITY_NOT_METERED),
false /* defaultNetwork, templates should have DEFAULT_NETWORK_ALL */,
OEM_MANAGED_ALL);
} }
private long getRemainingDailyBudget(long limitBytes, private long getRemainingDailyBudget(long limitBytes,
@@ -375,7 +371,7 @@ public class MultipathPolicyTracker {
// This will only be called if the total quota for the day changed, not if usage changed // 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 // 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. // as soon as there are less than 2MB left for today.
if (budget > NetworkStatsManager.MIN_THRESHOLD_BYTES) { if (budget > MIN_THRESHOLD_BYTES) {
if (DBG) { if (DBG) {
Log.d(TAG, "Setting callback for " + budget + " bytes on network " + network); Log.d(TAG, "Setting callback for " + budget + " bytes on network " + network);
} }