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

Commit 894da5ac authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e4 am:... 

Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e4 am: 4fe680f9 am: 0af8ddf6
am: 456edab6

Change-Id: I2339f2d669aaa756f26d0843bf1a3c85cb7a9656
parents 1ded6404 456edab6

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -2234,6 +2234,11 @@ 
    <!-- Flag specifying whether WFC over IMS is available on device -->

        <bool name="config_device_wfc_ims_available">false</bool>



    <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of

         carrier provisioning. If false: hard disabled. If true: then depends on carrier

         provisioning, availability etc -->

    <bool name="config_carrier_wfc_ims_available">false</bool>



    <bool name="config_networkSamplingWakesDevice">true</bool>



    <string-array translatable="false" name="config_cdma_home_system" />

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2225,6 +2225,7 @@ 
  <java-symbol type="bool" name="config_device_respects_hold_carrier_config" />

  <java-symbol type="bool" name="config_carrier_vt_available" />

  <java-symbol type="bool" name="config_device_wfc_ims_available" />

  <java-symbol type="bool" name="config_carrier_wfc_ims_available" />

  <java-symbol type="attr" name="touchscreenBlocksFocus" />

  <java-symbol type="layout" name="resolver_list_with_default" />

  <java-symbol type="string" name="whichApplicationNamed" />