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

Commit 4ecb670b authored by Etan Cohen's avatar Etan Cohen Committed by Automerger Merge Worker
Browse files

Merge changes from topic "carrier_configs_v2" into sc-dev am: 7cd37dcb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944379

Change-Id: I282f892f42af639a563dd25e0800937ae75d92bc
parents ecd46961 7cd37dcb

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -40548,6 +40548,7 @@ package android.telephony { 
    field public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL = "disable_charge_indication_bool";

    field public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL = "disable_charge_indication_bool";

    field public static final String KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL = "disable_supplementary_services_in_airplane_mode_bool";

    field public static final String KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL = "disable_supplementary_services_in_airplane_mode_bool";

    field public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY = "disconnect_cause_play_busytone_int_array";

    field public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY = "disconnect_cause_play_busytone_int_array";

    field public static final String KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL = "display_call_strength_indicator_bool";

    field public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool";

    field public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool";

    field public static final String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

    field public static final String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

    field public static final String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

    field public static final String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";
@@ -40572,6 +40573,7 @@ package android.telephony { 
    field public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";

    field public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";

    field public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";

    field public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";

    field public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL = "hide_lte_plus_data_icon_bool";

    field public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL = "hide_lte_plus_data_icon_bool";

    field public static final String KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL = "hide_no_calling_indicator_on_data_network_bool";

    field public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";

    field public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";

    field public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool";

    field public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool";

    field public static final String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";

    field public static final String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+26 −0
Original line number Original line Diff line number Diff line
@@ -4849,6 +4849,30 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL =

    public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL =

            "carrier_provisions_wifi_merged_networks_bool";

            "carrier_provisions_wifi_merged_networks_bool";





    /**

     * Determines whether or not to use (IP) data connectivity as a supplemental condition to

     * control the visibility of the no-calling indicator for this carrier in the System UI. Setting

     * the configuration to true may make sense to a carrier which provides OTT calling.

     *

     * Config = true: do not show no-calling indication if (IP) data connectivity is available

     *                or telephony has voice registration.

     * Config = false: do not show no-calling indication if telephony has voice registration.

     */

    public static final String KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL =

            "hide_no_calling_indicator_on_data_network_bool";



    /**

     * Determine whether or not to display a call strength indicator for this carrier in the System

     * UI. Disabling the indication may be reasonable if the carrier's calling is not integrated

     * into the Android telephony stack (e.g. it is OTT).

     *

     * true: Use telephony APIs to detect the current networking medium of calling and display a

     *       UI indication based on the current strength (e.g. signal level) of that medium.

     * false: Do not display the call strength indicator.

     */

    public static final String KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL =

            "display_call_strength_indicator_bool";



    /** The default value for every variable. */

    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;

    private final static PersistableBundle sDefaults;
@@ -5422,6 +5446,8 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

                new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});

                new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL, false);

        sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);

        sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");

        sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");

    }

    }