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

Commit 22bf81a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert submission"

parents 4c9d7b0b 31ca4f85

telephony/java/android/telephony/CarrierConfigManager.java

+1 −4
Original line number Diff line number Diff line
@@ -1052,9 +1052,6 @@ public class CarrierConfigManager { 
     *

     * When {@code false}, the old behavior is used, where the toggle in accessibility settings is

     * used to set the IMS stack's RTT enabled state.

     *

     * @deprecated -- this flag no longer does anything. Remove once the new behavior is verified.

     *

     * @hide

     */

    public static final String KEY_IGNORE_RTT_MODE_SETTING_BOOL =
@@ -3497,7 +3494,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);

        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL, false);

        sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);