diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-09-09 16:15:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-09 16:15:52 +0000 |
| commit | 6544d5a2a7089b6e76c0548cd9f63f9400ce1082 (patch) | |
| tree | 7fc9d0aa868fb1674f77f3ff90f7866cd219aa86 /telephony/java | |
| parent | db4efcfa8dd996841eb50cf2594bea641b4f217a (diff) | |
| parent | dee1c5c948a5e1b98577a3301882aac04154b5be (diff) | |
| download | frameworks_base-6544d5a2a7089b6e76c0548cd9f63f9400ce1082.zip frameworks_base-6544d5a2a7089b6e76c0548cd9f63f9400ce1082.tar.gz frameworks_base-6544d5a2a7089b6e76c0548cd9f63f9400ce1082.tar.bz2 | |
am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit 'dee1c5c948a5e1b98577a3301882aac04154b5be':
Add carrier config for specifying invalid characters.
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index df8affe..8889ca9 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -267,6 +267,16 @@ public class CarrierConfigManager { "carrier_instant_lettering_available_bool"; /** + * When IMS instant lettering is available for a carrier (see + * {@link #KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL}), determines the list of characters + * which may not be contained in messages. Should be specified as a regular expression suitable + * for use with {@link String#matches(String)}. + * @hide + */ + public static final String KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING = + "carrier_instant_lettering_invalid_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 @@ -432,6 +442,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true); 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.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); |