Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffa8af3f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add USSD codes over IMS feature" am: e696f454 am: 9cfecba8 

Change-Id: I5068ea0a746e76516ccb5eeddf272fecfdf2ab52
parents d0f1df56 9cfecba8

core/res/res/values/config.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -2978,6 +2978,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" />

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2553,6 +2553,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" />