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

Commit cbf9474c authored by Hall Liu's avatar Hall Liu
Browse files

Standardize RTT behavior across carriers 

Remove references to the ignore rtt setting carrier config key, and
treat it as always-on for all carriers.

Bug: 122250491
Bug: 130010750
Test: manual
Change-Id: I305ed17fba7910983bcd64b8221b9bba8a5d7960
Merged-In: I305ed17fba7910983bcd64b8221b9bba8a5d7960
parent 733b7e1f

src/com/android/server/telecom/CallsManager.java

+5 −28
Original line number Diff line number Diff line
@@ -1189,10 +1189,8 @@ public class CallsManager extends Call.ListenerBase 
            }

        }



        boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);

        if (isRttSettingOn ||

                extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {

            Log.i(this, "Incoming call requesting RTT, rtt setting is %b", isRttSettingOn);

        if (extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {

            Log.i(this, "Incoming call requesting RTT");

            call.createRttStreams();

            // Even if the phone account doesn't support RTT yet, the connection manager might

            // change that. Set this to check it later.
@@ -1640,12 +1638,9 @@ public class CallsManager extends Call.ListenerBase 


                    boolean isVoicemail = isVoicemail(callToUse.getHandle(), accountToUse);



                    boolean isRttSettingOn = isRttSettingOn(phoneAccountHandle);

                    if (!isVoicemail && (isRttSettingOn || (extras != null

                            && extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT,

                            false)))) {

                        Log.d(this, "Outgoing call requesting RTT, rtt setting is %b",

                                isRttSettingOn);

                    if (!isVoicemail && extras != null

                            && extras.getBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, false)) {

                        Log.d(this, "Outgoing call requesting RTT");

                        if (callToUse.isEmergencyCall() || (accountToUse != null

                                && accountToUse.hasCapabilities(PhoneAccount.CAPABILITY_RTT))) {

                            // If the call requested RTT and it's an emergency call, ignore the
@@ -2531,24 +2526,6 @@ public class CallsManager extends Call.ListenerBase 
        mProximitySensorManager.turnOff(screenOnImmediately);

    }



    private boolean isRttSettingOn(PhoneAccountHandle handle) {

        boolean isRttModeSettingOn = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.RTT_CALLING_MODE, 0) != 0;

        // If the carrier config says that we should ignore the RTT mode setting from the user,

        // assume that it's off (i.e. only make an RTT call if it's requested through the extra).

        boolean shouldIgnoreRttModeSetting = getCarrierConfigForPhoneAccount(handle)

                .getBoolean(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);

        return isRttModeSettingOn && !shouldIgnoreRttModeSetting;

    }



    private PersistableBundle getCarrierConfigForPhoneAccount(PhoneAccountHandle handle) {

        int subscriptionId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(handle);

        CarrierConfigManager carrierConfigManager =

                mContext.getSystemService(CarrierConfigManager.class);

        PersistableBundle result = carrierConfigManager.getConfigForSubId(subscriptionId);

        return result == null ? new PersistableBundle() : result;

    }



    void phoneAccountSelected(Call call, PhoneAccountHandle account, boolean setDefault) {

        if (!mCalls.contains(call)) {

            Log.i(this, "Attempted to add account to unknown call %s", call);