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

Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"

Browse Source 
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
This commit is contained in:
Zoey Chen
2019-12-26 05:02:24 -08:00
committed by android-build-merger
parent 7664d08e28 47634431c6
commit 4359db040c
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) NetworkPolicyManager policyManager = (NetworkPolicyManager)
mContext.getSystemService(Context.NETWORK_POLICY_SERVICE); mContext.getSystemService(Context.NETWORK_POLICY_SERVICE);
if (policyManager != null) { if (policyManager != null) {
String subscriberId = telephonyManager.getSubscriberId(mSubId); String subscriberId = telephonyManager.getSubscriberId();
policyManager.factoryReset(subscriberId); 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)) { if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) {
telephonyManager = telephonyManager
.createForSubscriptionId(info.getSubscriptionId());
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll( NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
telephonyManager.getSubscriberId(info.getSubscriptionId())); telephonyManager.getSubscriberId());
final JSONObject usage = dumpDataUsage(mobileAll, controller); final JSONObject usage = dumpDataUsage(mobileAll, controller);
usage.put("subId", info.getSubscriptionId()); usage.put("subId", info.getSubscriptionId());
array.put(usage); array.put(usage);