LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have buildTemplateMobileWithRatType take metered parameter

Browse Source 
To support unmetered 5g, have buildTemplateMobileWithRatType take
metered parameter to build a template which could be used to filter
an unmetered network.

Bug: 183776809
Test: atest FrameworksNetTests:NetworkStatsServiceTest
Change-Id: Ia310d90eceeb572a35ce9518de02b198cae16705
Merged-In: Ia310d90eceeb572a35ce9518de02b198cae16705
This commit is contained in:
Aaron Huang
2021-07-27 17:02:52 +08:00
parent 7cf5cd3044
commit 559c51f903
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/NetworkTemplate.java
View File

@@ -160,19 +160,19 @@ public class NetworkTemplate implements Parcelable {
} }
/** /**
* Template to match cellular networks with the given IMSI and {@code ratType}. * Template to match cellular networks with the given IMSI, {@code ratType} and
* Use {@link #NETWORK_TYPE_ALL} to include all network types when filtering. * {@code metered}. Use {@link #NETWORK_TYPE_ALL} to include all network types when
* See {@code TelephonyManager.NETWORK_TYPE_*}. * filtering. See {@code TelephonyManager.NETWORK_TYPE_*}.
*/ */
public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId, public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId,
@NetworkType int ratType) { @NetworkType int ratType, int metered) {
if (TextUtils.isEmpty(subscriberId)) { if (TextUtils.isEmpty(subscriberId)) {
return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null, null, return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null, null,
METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL, metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT); SUBSCRIBER_ID_MATCH_RULE_EXACT);
} }
return new NetworkTemplate(MATCH_MOBILE, subscriberId, new String[]{subscriberId}, null, return new NetworkTemplate(MATCH_MOBILE, subscriberId, new String[]{subscriberId}, null,
METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL, metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT); SUBSCRIBER_ID_MATCH_RULE_EXACT);
} }