summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-09-11 15:43:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-11 15:43:19 +0000
commitca7240a0726a110b9fd302a62ea9baaf3c5d14ac (patch)
treea6011b1d8d3355b03c13ed7fb9896da1f5f01963 /telephony/java
parente3d006b1abce25b9c0163e0471830ad5d01c3670 (diff)
parent8ed28188b95be4f377909ac2abacaef76e004a61 (diff)
downloadframeworks_base-ca7240a0726a110b9fd302a62ea9baaf3c5d14ac.zip
frameworks_base-ca7240a0726a110b9fd302a62ea9baaf3c5d14ac.tar.gz
frameworks_base-ca7240a0726a110b9fd302a62ea9baaf3c5d14ac.tar.bz2
am 8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
* commit '8ed28188b95be4f377909ac2abacaef76e004a61': Add carrier config for characters to escape with backslash.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index e675c6d..98f7dd2 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -277,6 +277,17 @@ public class CarrierConfigManager {
"carrier_instant_lettering_invalid_chars_string";
/**
+ * When IMS instant lettering is available for a carrier (see
+ * {@link #KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL}), determines a list of characters which
+ * must be escaped with a backslash '\' character. Should be specified as a string containing
+ * the characters to be escaped. For example to escape quote and backslash the string would be
+ * a quote and a backslash.
+ * @hide
+ */
+ public static final String KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING =
+ "carrier_instant_lettering_escaped_chars_string";
+
+ /**
* If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or RIL_RADIO_TECHNOLOGY_UNKNOWN:0
* this is the value that should be used instead. A configuration value of
* RIL_RADIO_TECHNOLOGY_UNKNOWN:0 means there is no replacement value and that the default
@@ -463,6 +474,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
+ sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");
sDefaults.putBoolean(KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, false);
sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);