Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7126fddf authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Renew the API getCallState" into main

parents 6cf28bc0 2d16858c

src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/network/telephony/WifiCallingPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+1 −1
Original line number Diff line number Diff line
@@ -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;