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

Commit 61ccd176 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add carrier config key for TTY support." 

am: 16f6deae

Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f
parents 123a9ed2 16f6deae

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42270,6 +42270,7 @@ package android.telephony { 
    field public static final String KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL = "support_pause_ims_video_calls_bool";

    field public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

    field public static final String KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL = "treat_downgraded_video_calls_as_video_calls_bool";

    field public static final String KEY_TTY_SUPPORTED_BOOL = "tty_supported_bool";

    field public static final String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";

    field public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.PersistableBundle; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.service.carrier.CarrierService;

import android.telecom.TelecomManager;

import android.telephony.ims.ImsReasonInfo;



import com.android.internal.telephony.ICarrierConfigLoader;
@@ -2124,6 +2125,18 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";



    /**

     * Boolean flag indicating whether the carrier supports TTY.

     * <p>

     * Note that {@link #KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL} controls availability of TTY over

     * VoLTE; if {@link #KEY_TTY_SUPPORTED_BOOL} is disabled, then

     * {@link #KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL} is also implicitly disabled.

     * <p>

     * {@link TelecomManager#isTtySupported()} should be used to determine if a device supports TTY,

     * and this carrier config key should be used to see if the current carrier supports it.

     */

    public static final String KEY_TTY_SUPPORTED_BOOL = "tty_supported_bool";



    /**

     * Indicates if the carrier supports auto-upgrading a call to RTT when receiving a call from a

     * RTT-supported device.
@@ -2798,6 +2811,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);

        sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);

        sDefaults.putBoolean(KEY_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);