Merge "Add carrier config for hiding TTY HCO and VCO" into qt-r1-dev

am: 7033e7f4f1

Change-Id: I81a77571ae72459a460679b401ee908b71364aa2
This commit is contained in:
Hall Liu
2019-07-31 18:17:49 -07:00
committed by android-build-merger

View File

@@ -2327,6 +2327,13 @@ public class CarrierConfigManager {
*/
public static final String KEY_RTT_DOWNGRADE_SUPPORTED_BOOL = "rtt_downgrade_supported_bool";
/**
* Indicates if the TTY HCO and VCO options should be hidden in the accessibility menu
* if the device is capable of RTT.
* @hide
*/
public static final String KEY_HIDE_TTY_HCO_VCO_WITH_RTT_BOOL = "hide_tty_hco_vco_with_rtt";
/**
* The flag to disable the popup dialog which warns the user of data charges.
* @hide
@@ -3390,6 +3397,7 @@ public class CarrierConfigManager {
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_HIDE_TTY_HCO_VCO_WITH_RTT_BOOL, false);
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);