Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4359db04 authored by Zoey Chen's avatar Zoey Chen Committed by android-build-merger
Browse files

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

am: 47634431

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
parents 7664d08e 47634431

src/com/android/settings/ResetNetworkConfirm.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

src/com/android/settings/SettingsDumpService.java

+3 −1
Original line number Diff line number Diff line
@@ -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);