| commit | 2d16858c17131b320dda841bbcabcce984cda57c | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Mon Nov 20 10:46:02 2023 +0000 |
| committer | SongFerng Wang <songferngwang@google.com> | Mon Nov 20 10:49:19 2023 +0000 |
| tree | 197f647f26279cdc1a9f82cc9aa71d181f025566 | |
| parent | 8edc0b70525e2c89ef864fc27b3ce73cefa983dc [diff] |
Renew the API getCallState Since the getCallState was marked as @Deprecated, renew this API as the getCallStateForSubscription. Bug: 279852410 Test: build pass Change-Id: I224164a2d1089483d4f63da1651d7e87296e87f4
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java index ebfb283..cc0f22d 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java +++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
@@ -240,8 +240,8 @@ 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 0a0b41f..5503e95 100644 --- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -218,7 +218,7 @@ 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 739f8b2..a90d627 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -125,7 +125,7 @@ if (prefSwitch != null) { isWfcEnabled = prefSwitch.isChecked(); isCallStateIdle = getTelephonyManagerForSub( - WifiCallingSettingsForSub.this.mSubId).getCallState() + WifiCallingSettingsForSub.this.mSubId).getCallStateForSubscription() == TelephonyManager.CALL_STATE_IDLE; boolean isNonTtyOrTtyOnVolteEnabled = true;