diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java index ebfb283a05d..cc0f22db495 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java +++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java @@ -240,8 +240,8 @@ public class NetworkProviderWifiCallingGroup extends return true; }); - pref.setEnabled(getTelephonyManagerForSubscriptionId(subId).getCallState() - == TelephonyManager.CALL_STATE_IDLE); + pref.setEnabled(getTelephonyManagerForSubscriptionId(subId) + .getCallStateForSubscription() == TelephonyManager.CALL_STATE_IDLE); pref.setOrder(order++); int resId = com.android.internal.R.string.wifi_calling_off_summary; diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java index 0a0b41f9e2a..5503e95854d 100644 --- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java @@ -218,7 +218,7 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont mTelephonyManager = getTelephonyManager(context, subId); // assign current call state so that it helps to show correct preference state even // before first onCallStateChanged() by initial registration. - mCallState = mTelephonyManager.getCallState(subId); + mCallState = mTelephonyManager.getCallStateForSubscription(); mTelephonyManager.registerTelephonyCallback(context.getMainExecutor(), this); } diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 739f8b25b23..a90d627c644 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -125,7 +125,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment if (prefSwitch != null) { isWfcEnabled = prefSwitch.isChecked(); isCallStateIdle = getTelephonyManagerForSub( - WifiCallingSettingsForSub.this.mSubId).getCallState() + WifiCallingSettingsForSub.this.mSubId).getCallStateForSubscription() == TelephonyManager.CALL_STATE_IDLE; boolean isNonTtyOrTtyOnVolteEnabled = true;