Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 am: 09f3bce8c6 am: a583aee08d

Browse Source 
Change-Id: I3ee0e068b4850ac2e2f7bb5799b3e27aac12e09e
This commit is contained in:
Automerger Merge Worker
2020-02-28 16:26:41 +00:00
parent 060f56116e a583aee08d
commit e6fa44248b
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -2975,6 +2975,10 @@
<!-- Whether to use voip audio mode for ims call --> <!-- Whether to use voip audio mode for ims call -->
<bool name="config_use_voip_mode_for_ims">false</bool> <bool name="config_use_voip_mode_for_ims">false</bool>
<!-- Boolean indicating USSD over IMS is allowed.
If it is not supported due to modem limitations, USSD send over the CS pipe instead.-->
<bool name="config_allow_ussd_over_ims">false</bool>
<!-- String array containing numbers that shouldn't be logged. Country-specific. --> <!-- String array containing numbers that shouldn't be logged. Country-specific. -->
<string-array name="unloggable_phone_numbers" /> <string-array name="unloggable_phone_numbers" />

1
core/res/res/values/symbols.xml
View File

@@ -2554,6 +2554,7 @@
<java-symbol type="bool" name="config_device_wfc_ims_available" /> <java-symbol type="bool" name="config_device_wfc_ims_available" />
<java-symbol type="bool" name="config_carrier_wfc_ims_available" /> <java-symbol type="bool" name="config_carrier_wfc_ims_available" />
<java-symbol type="bool" name="config_use_voip_mode_for_ims" /> <java-symbol type="bool" name="config_use_voip_mode_for_ims" />
<java-symbol type="bool" name="config_allow_ussd_over_ims" />
<java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="attr" name="touchscreenBlocksFocus" />
<java-symbol type="layout" name="resolver_list_with_default" /> <java-symbol type="layout" name="resolver_list_with_default" />
<java-symbol type="string" name="activity_resolver_set_always" /> <java-symbol type="string" name="activity_resolver_set_always" />