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

Commit c8a09d54 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

Merge "Separate VoLTE and VT configurations to enable devices/carriers to have... 

Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev
parents 9016ecab e41a9cf9

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -6599,7 +6599,7 @@ public final class Settings { 
         * Type: int (0 for false, 1 for true)

         * @hide

         */

        public static final String VOLTE_VT_ENABLED = "volte_vt_enabled";

        public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

core/res/res/values-mcc310-mnc260/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
    -->

    <integer name="config_mobile_mtu">1440</integer>



    <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of

    <!-- Flag specifying whether VoLTE 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_volte_vt_available">true</bool>

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

</resources>

core/res/res/values-mcc311-mnc480/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ 
        be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->

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



    <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of

    <!-- Flag specifying whether VoLTE 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_volte_vt_available">true</bool>

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



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

    <!-- service number convert map in roaming network. -->

core/res/res/values/config.xml

+12 −4
Original line number Diff line number Diff line
@@ -1787,13 +1787,21 @@ 
        be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->

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



    <!-- Flag specifying whether VoLTE & VT is availasble on device -->

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

    <!-- Flag specifying whether VoLTE is available on device -->

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



    <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of

    <!-- Flag specifying whether VoLTE 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_volte_vt_available">false</bool>

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



    <!-- Flag specifying whether VT is available on device -->

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



    <!-- Flag specifying whether VT 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_vt_available">false</bool>



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

core/res/res/values/symbols.xml

+4 −2
Original line number Diff line number Diff line
@@ -2040,8 +2040,10 @@ 
  <java-symbol type="attr" name="preferenceFragmentStyle" />

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

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

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

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

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

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

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

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

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

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

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