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

Commit 831e9f98 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "Convert useImsAlwaysForEmergencyCall to carrier configuration."

parents a25f6fcf cd811f0c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30635,6 +30635,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

    field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32905,6 +32905,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

    field public static final java.lang.String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";

    field public static final java.lang.String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -2029,10 +2029,6 @@ 
        IMS service implementation will do both.i.e.hold followed by merge. -->

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



    <!-- Flag indicating emergency calls will always use IMS irrespective of the state of

    the IMS connection -->

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



    <!-- Flag indicating whether the IMS service can be turned off. If false then

        the service will not be turned-off completely (the ImsManager.turnOffIms() will

        be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2138,7 +2138,6 @@ 
  <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="bool" name="useImsAlwaysForEmergencyCall" />

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

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

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

telephony/java/android/telephony/CarrierConfigManager.java

+9 −1
Original line number Diff line number Diff line
@@ -261,11 +261,18 @@ public class CarrierConfigManager { 
    /**

     * Flag specifying whether IMS instant lettering is available for the carrier.  {@code True} if

     * instant lettering is available for the carrier, {@code false} otherwise.

     * @hide

     */

    public static final String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL =

            "carrier_instant_lettering_available_bool";



    /*

     * Flag specifying whether IMS should be the first phone attempted for E911 even if the

     * phone is not in service.

     * @hide

     */

    public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL

            = "carrier_use_ims_first_for_emergency_bool";



    /**

     * If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or RIL_RADIO_TECHNOLOGY_UNKNOWN:0

     * this is the value that should be used instead. A configuration value of
@@ -425,6 +432,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);

        sDefaults.putBoolean(KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, false);

        sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);