summaryrefslogtreecommitdiff
path: root/android/telephony/CarrierConfigManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/telephony/CarrierConfigManager.java')
-rw-r--r--android/telephony/CarrierConfigManager.java34
1 files changed, 0 insertions, 34 deletions
diff --git a/android/telephony/CarrierConfigManager.java b/android/telephony/CarrierConfigManager.java
index de980b2f..689ce954 100644
--- a/android/telephony/CarrierConfigManager.java
+++ b/android/telephony/CarrierConfigManager.java
@@ -763,18 +763,6 @@ public class CarrierConfigManager {
public static final String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
/**
- * Some carriers will send call forwarding responses for voicemail in a format that is not 3gpp
- * compliant, which causes issues during parsing. This causes the
- * {@link com.android.internal.telephony.CallForwardInfo#number} to contain non-numerical
- * characters instead of a number.
- *
- * If true, we will detect the non-numerical characters and replace them with "Voicemail".
- * @hide
- */
- public static final String KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL =
- "call_forwarding_map_non_number_to_voicemail_bool";
-
- /**
* Determines whether conference calls are supported by a carrier. When {@code true},
* conference calling is supported, {@code false otherwise}.
*/
@@ -1585,25 +1573,6 @@ public class CarrierConfigManager {
public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =
"show_ims_registration_status_bool";
- /**
- * The flag to disable the popup dialog which warns the user of data charges.
- * @hide
- */
- public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =
- "disable_charge_indication_bool";
-
- /**
- * Boolean indicating whether to skip the call forwarding (CF) fail-to-disable dialog.
- * The logic used to determine whether we succeeded in disabling is carrier specific,
- * so the dialog may not always be accurate.
- * {@code false} - show CF fail-to-disable dialog.
- * {@code true} - skip showing CF fail-to-disable dialog.
- *
- * @hide
- */
- public static final String KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL =
- "skip_cf_fail_to_disable_dialog_bool";
-
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -1734,7 +1703,6 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_GSM_DTMF_TONE_DELAY_INT, 0);
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.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);
@@ -1758,7 +1726,6 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);
- sDefaults.putBoolean(KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);
@@ -1873,7 +1840,6 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
- sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
}
/**