From 353926a446dd1c60681ec5ad36e7f17af571b7c2 Mon Sep 17 00:00:00 2001
From: zoey chen <zoeychen@google.com>
Date: Tue, 24 Dec 2019 19:37:11 +0800
Subject: [PATCH] [Settings] Replace #getSubscriberId(I) with
 #getSubscriberId()

Bug: 146823314
Test: make
Change-Id: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
---
 src/com/android/settings/ResetNetworkConfirm.java | 2 +-
 src/com/android/settings/SettingsDumpService.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index ffc04126c10..ee11ce089c9 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -114,7 +114,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);
             }
 
diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index 501536a6eb0..487ccf51e77 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -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);