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

Commit 11b4498a authored by Ammar Aijazi's avatar Ammar Aijazi
Browse files

Add carrier config keys to control the data cycle. 

Adds the following keys: KEY_MONTHLY_DATA_CYCLE_DAY,
KEY_DATA_WARNING_THRESHOLD, and KEY_DATA_LIMIT_THRESHOLD.

This allows carrier apps to control the monthly data cycle reset date,
as well as fill in data warnings and limits based on plan details.

Bug: b/34385985
Test: No explicit tests for the API additions, but will add tests to the
follow up review which adds functionality that depends on these fields.
Change-Id: I2aee5cdbc4b707e28062830f1143c694ccae13cd
parent 2ffca839

api/current.txt

+5 −1
Original line number Diff line number Diff line
@@ -25192,8 +25192,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -39174,6 +39174,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";
@@ -39216,6 +39217,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";
@@ -39271,6 +39274,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

+5 −1
Original line number Diff line number Diff line
@@ -27311,8 +27311,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -42533,6 +42533,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";
@@ -42575,6 +42576,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";
@@ -42630,6 +42633,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

+5 −1
Original line number Diff line number Diff line
@@ -25293,8 +25293,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated void setNetworkPreference(int);
@@ -39363,6 +39363,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";
@@ -39405,6 +39406,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";
@@ -39460,6 +39463,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