PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MS49] Remove NetworkStats hidden Api usages

Browse Source 
This includes:
1. Remove unused INetworkStatsService and NetworkStatsHistory.
2. Replace NetworkTemplate usages with builder.
3. Replace TrafficStats references to DataUnit.
4. Reimplement NetworkTemplate#normalize.

Test: make RunSettingsRoboTests
Bug: 204830222

  (cherry-picked from ag/16724040)

Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
Merged-In: I8efecda5df403e9ed588daecd169cb3498d213a2
This commit is contained in:
Junyu Lai
2022-01-10 12:30:16 +00:00
committed by Frank Li
parent cd2bbccf3a
commit e539db77c4
12 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/datausage/DataUsagePreference.java
View File

@@ -53,7 +53,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
mTemplate = template;
mSubId = subId;
final DataUsageController controller = getDataUsageController();
if (mTemplate.isMatchRuleMobile()) {
if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
setTitle(R.string.app_cellular_data_usage);
} else {
final DataUsageController.DataUsageInfo usageInfo =
@@ -78,13 +78,14 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
final SubSettingLauncher launcher;
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.getMatchRule()
== NetworkTemplate.MATCH_MOBILE
? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
launcher = new SubSettingLauncher(getContext())
.setArguments(args)
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN);
if (mTemplate.isMatchRuleMobile()) {
if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
launcher.setTitleRes(R.string.app_cellular_data_usage);
} else {
launcher.setTitleRes(mTitleRes);