Merge "Revert "Add USSD codes over IMS feature"" am: a027373f2d am: 962f149147

Change-Id: I4c9cd1d7c884e9b260e2f074dabe014219a5c619
This commit is contained in:
Automerger Merge Worker
2020-03-03 15:50:10 +00:00
2 changed files with 0 additions and 5 deletions

View File

@@ -3046,10 +3046,6 @@
<!-- Whether to use voip audio mode for ims call -->
<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 name="unloggable_phone_numbers" />

View File

@@ -2635,7 +2635,6 @@
<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_use_voip_mode_for_ims" />
<java-symbol type="bool" name="config_allow_ussd_over_ims" />
<java-symbol type="attr" name="touchscreenBlocksFocus" />
<java-symbol type="layout" name="resolver_list_with_default" />
<java-symbol type="string" name="activity_resolver_set_always" />