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

Commit 8fff72a0 authored by Yawen Su's avatar Yawen Su Committed by Android (Google) Code Review
Browse files

Merge "Add carrier config for cross sim calling on opportunistic data."

parents 47084334 5cc57b60

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41481,6 +41481,7 @@ package android.telephony { 
    field public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL = "editable_wfc_roaming_mode_bool";

    field public static final String KEY_EMERGENCY_NOTIFICATION_DELAY_INT = "emergency_notification_delay_int";

    field public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY = "emergency_number_prefix_string_array";

    field public static final String KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL = "enable_cross_sim_calling_on_opportunistic_data_bool";

    field public static final String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL = "enhanced_4g_lte_on_by_default_bool";

    field public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT = "enhanced_4g_lte_title_variant_int";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -797,6 +797,14 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL =

            "carrier_cross_sim_ims_available_bool";



    /**

     * Flag specifying whether cross sim calling on opportunistic data is supported for carrier.

     * When {@code false} the carrier does not support cross sim calling on opportunistic data.

     * When {@code true} the carrier does support cross sim calling on opportunistic data.

     */

    public static final String KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL =

            "enable_cross_sim_calling_on_opportunistic_data_bool";



    /**

     * Specifies a map from dialstrings to replacements for roaming network service numbers which

     * cannot be replaced on the carrier side.
@@ -5587,6 +5595,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_VILTE_DATA_IS_METERED_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL, false);