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

Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea

Browse Source 
Change-Id: I9750d2b07e3b6280d2e3e9e2779f2740d24f0cdf
This commit is contained in:
Automerger Merge Worker
2019-12-26 09:55:38 +00:00
parent 631a1d206c 3835293aea
commit 3d73b7a832
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/sim/CallsSimListDialogFragment.java
View File

@@ -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;

3
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -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;
}
}