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

Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c

Browse Source 
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
This commit is contained in:
Automerger Merge Worker
2019-12-26 13:11:36 +00:00
parent 9494af9634 4359db040c
commit b206208982
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -113,7 +113,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
NetworkPolicyManager policyManager = (NetworkPolicyManager)
mContext.getSystemService(Context.NETWORK_POLICY_SERVICE);
if (policyManager != null) {
String subscriberId = telephonyManager.getSubscriberId(mSubId);
String subscriberId = telephonyManager.getSubscriberId();
policyManager.factoryReset(subscriberId);
}

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

@@ -107,8 +107,10 @@ public class SettingsDumpService extends Service {
if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) {
telephonyManager = telephonyManager
.createForSubscriptionId(info.getSubscriptionId());
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
telephonyManager.getSubscriberId(info.getSubscriptionId()));
telephonyManager.getSubscriberId());
final JSONObject usage = dumpDataUsage(mobileAll, controller);
usage.put("subId", info.getSubscriptionId());
array.put(usage);