From af4b43535fbde7dfb362a587b05376cf5039a4b2 Mon Sep 17 00:00:00 2001 From: zoey chen Date: Tue, 24 Dec 2019 19:21:16 +0800 Subject: [PATCH] [Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId Bug: 146823458 Test: make Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee --- src/com/android/settings/sim/CallsSimListDialogFragment.java | 3 +-- src/com/android/settings/sim/SimDialogActivity.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/sim/CallsSimListDialogFragment.java b/src/com/android/settings/sim/CallsSimListDialogFragment.java index 7d3de443821..6dd262b256c 100644 --- a/src/com/android/settings/sim/CallsSimListDialogFragment.java +++ b/src/com/android/settings/sim/CallsSimListDialogFragment.java @@ -47,8 +47,7 @@ public class CallsSimListDialogFragment extends SimListDialogFragment { return result; } for (PhoneAccountHandle handle : phoneAccounts) { - final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle); - final int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount); + final int subId = telephonyManager.getSubscriptionId(handle); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { continue; diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index d24dbf56f24..0ae294e9912 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -176,8 +176,7 @@ public class SimDialogActivity extends FragmentActivity { final TelephonyManager telephonyManager = getSystemService(TelephonyManager.class); for (PhoneAccountHandle handle : telecomManager.getCallCapablePhoneAccounts()) { - final PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle); - if (subId == telephonyManager.getSubIdForPhoneAccount(phoneAccount)) { + if (subId == telephonyManager.getSubscriptionId(handle)) { return handle; } }