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

Commit 552d8367 authored by Ammar Aijazi's avatar Ammar Aijazi Committed by Android (Google) Code Review
Browse files

Merge "Add carrier config keys to control the data cycle."

parents 9b31b4ea 11b4498a

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -39178,6 +39178,7 @@ package android.telephony { 
    method public android.os.PersistableBundle getConfigForSubId(int);

    method public void notifyConfigChangedForSubId(int);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe

    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
@@ -39220,6 +39221,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";
@@ -39275,6 +39278,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";

    field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";

    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_MONTHLY_DATA_CYCLE_DAY_INT = "monthly_data_cycle_day_int";

    field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -42536,6 +42536,7 @@ package android.telephony { 
    method public void notifyConfigChangedForSubId(int);

    method public void updateConfigForPhoneId(int, java.lang.String);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe

    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
@@ -42578,6 +42579,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";
@@ -42633,6 +42636,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";

    field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";

    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_MONTHLY_DATA_CYCLE_DAY_INT = "monthly_data_cycle_day_int";

    field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -39367,6 +39367,7 @@ package android.telephony { 
    method public android.os.PersistableBundle getConfigForSubId(int);

    method public void notifyConfigChangedForSubId(int);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2; // 0xfffffffe

    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final java.lang.String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
@@ -39409,6 +39410,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";
@@ -39464,6 +39467,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_UA_PROF_TAG_NAME_STRING = "uaProfTagName";

    field public static final java.lang.String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";

    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_MONTHLY_DATA_CYCLE_DAY_INT = "monthly_data_cycle_day_int";

    field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+66 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,68 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY =

            "call_forwarding_blocks_while_roaming_string_array";



    /**

     * The day of the month (1-31) on which the data cycle rolls over.

     * <p>

     * If the current month does not have this day, the cycle will roll over at the start of the

     * next month.

     * <p>

     * This setting may be still overridden by explicit user choice. By default, the platform value

     * will be used.

     */

    public static final String KEY_MONTHLY_DATA_CYCLE_DAY_INT =

            "monthly_data_cycle_day_int";



    /**

     * When {@link #KEY_MONTHLY_DATA_CYCLE_DAY_INT}, {@link #KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG},

     * or {@link #KEY_DATA_WARNING_THRESHOLD_BYTES_LONG} are set to this value, the platform default

     * value will be used for that key.

     *

     * @hide

     */

    public static final int DATA_CYCLE_USE_PLATFORM_DEFAULT = -1;



    /**

     * Flag indicating that a data cycle threshold should be disabled.

     * <p>

     * If {@link #KEY_DATA_WARNING_THRESHOLD_BYTES_LONG} is set to this value, the platform's

     * default data warning, if one exists, will be disabled. A user selected data warning will not

     * be overridden.

     * <p>

     * If {@link #KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG} is set to this value, the platform's

     * default data limit, if one exists, will be disabled. A user selected data limit will not be

     * overridden.

     */

    public static final int DATA_CYCLE_THRESHOLD_DISABLED = -2;



    /**

     * Controls the data usage warning.

     * <p>

     * If the user uses more than this amount of data in their billing cycle, as defined by

     * {@link #KEY_MONTHLY_DATA_CYCLE_DAY_INT}, the user will be alerted about the usage.

     * If the value is set to {@link #DATA_CYCLE_THRESHOLD_DISABLED}, the data usage warning will

     * be disabled.

     * <p>

     * This setting may be overridden by explicit user choice. By default, the platform value

     * will be used.

     */

    public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG =

            "data_warning_threshold_bytes_long";



    /**

     * Controls the cellular data limit.

     * <p>

     * If the user uses more than this amount of data in their billing cycle, as defined by

     * {@link #KEY_MONTHLY_DATA_CYCLE_DAY_INT}, cellular data will be turned off by the user's

     * phone. If the value is set to {@link #DATA_CYCLE_THRESHOLD_DISABLED}, the data limit will be

     * disabled.

     * <p>

     * This setting may be overridden by explicit user choice. By default, the platform value

     * will be used.

     */

    public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG =

            "data_limit_threshold_bytes_long";



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

    private final static PersistableBundle sDefaults;
@@ -1515,6 +1577,10 @@ public class CarrierConfigManager { 
                });

        sDefaults.putStringArray(KEY_CARRIER_DEFAULT_REDIRECTION_URL_STRING_ARRAY, null);



        sDefaults.putInt(KEY_MONTHLY_DATA_CYCLE_DAY_INT, DATA_CYCLE_USE_PLATFORM_DEFAULT);

        sDefaults.putLong(KEY_DATA_WARNING_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT);

        sDefaults.putLong(KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG, DATA_CYCLE_USE_PLATFORM_DEFAULT);



        // Rat families: {GPRS, EDGE}, {EVDO, EVDO_A, EVDO_B}, {UMTS, HSPA, HSDPA, HSUPA, HSPAP},

        // {LTE, LTE_CA}

        // Order is important - lowest precidence first