diff options
| author | 2016-10-04 18:17:25 +0000 | |
|---|---|---|
| committer | 2016-10-04 18:17:25 +0000 | |
| commit | 2b7118fcbf5f69278d9f31837259fbedaea6ae2c (patch) | |
| tree | dc019689b81c60000cb9eb75114d4ba594f20435 | |
| parent | 32e1d7f6b49e281f4bd66ff505c152cbe2d55bf3 (diff) | |
| parent | 25b64aad011e207554f6497dd73e4764a6371a18 (diff) | |
Merge "Add editable_voicemail_number key to CarrierConfig"
am: 25b64aad01
Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 5018e2fb63c0..e64942aafbcf 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -345,8 +345,6 @@ <java-symbol type="integer" name="config_wifi_operating_voltage_mv" /> <java-symbol type="string" name="config_wifi_framework_sap_2G_channel_list" /> - <java-symbol type="bool" name="editable_voicemailnumber" /> - <java-symbol type="bool" name="config_wifi_framework_cellular_handover_enable_user_triggered_adjustment" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_tx_packet_threshold" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_rx_packet_threshold" /> diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 3fc945a83617..17f0da0c0b11 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -182,6 +182,14 @@ public class CarrierConfigManager { public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool"; /** + * Since the default voicemail number is empty, if a SIM card does not have a voicemail number + * available the user cannot use voicemail. This flag allows the user to edit the voicemail + * number in such cases, and is false by default. + * @hide + */ + public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL= "editable_voicemail_number_bool"; + + /** * Determine whether the voicemail notification is persistent in the notification bar. If true, * the voicemail notifications cannot be dismissed from the notification bar. */ @@ -792,6 +800,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false); sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true); sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false); + sDefaults.putBoolean(KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false); sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false); sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false); |