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

[MS50] Remove NetworkTemplate#buildTemplate* usages

Browse Source 
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.

Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
This commit is contained in:
Junyu Lai
2022-01-10 13:26:04 +00:00
parent a4f936408c
commit 123f2e1581
14 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/SettingsDumpService.java
View File

@@ -35,6 +35,7 @@ import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
import com.android.settingslib.net.DataUsageController;
@@ -109,14 +110,8 @@ public class SettingsDumpService extends Service {
if (telephonyManager.isDataCapable()) {
JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {
telephonyManager = telephonyManager
.createForSubscriptionId(info.getSubscriptionId());
String subscriberId = telephonyManager.getSubscriberId();
// The null subscriberId means that no any mobile/carrier network will be matched.
// Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.
NetworkTemplate template = subscriberId != null
? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)
: NetworkTemplate.buildTemplateMobileAll(subscriberId);
NetworkTemplate template = DataUsageLib.getMobileTemplateForSubId(
telephonyManager, info.getSubscriptionId());
final JSONObject usage = dumpDataUsage(template, controller);
usage.put("subId", info.getSubscriptionId());
array.put(usage);
@@ -125,12 +120,12 @@ public class SettingsDumpService extends Service {
}
if (packageManager.hasSystemFeature(FEATURE_WIFI)) {
obj.put("wifi", dumpDataUsage(
NetworkTemplate.buildTemplateWifi(
NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */), controller));
new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), controller));
}
if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) {
obj.put("ethernet", dumpDataUsage(NetworkTemplate.buildTemplateEthernet(), controller));
obj.put("ethernet", dumpDataUsage(new NetworkTemplate.Builder(
NetworkTemplate.MATCH_ETHERNET).build(), controller));
}
return obj;
}