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

Commit d42041fe authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by android-build-merger
Browse files

Merge "Define more thresholds for opportunistic data" am: cf2e0699 

am: c3bf9392

Change-Id: I44cd2e063fd5587ee7abf77e22acca7b08953a02
parents 9513822f c3bf9392

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -42215,6 +42215,9 @@ package android.telephony { 
    field public static final String KEY_MONTHLY_DATA_CYCLE_DAY_INT = "monthly_data_cycle_day_int";

    field public static final String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG = "opportunistic_network_data_switch_hysteresis_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG = "opportunistic_network_entry_or_exit_hysteresis_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_BANDWIDTH_INT = "opportunistic_network_entry_threshold_bandwidth_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT = "opportunistic_network_entry_threshold_rsrp_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSSNR_INT = "opportunistic_network_entry_threshold_rssnr_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSRP_INT = "opportunistic_network_exit_threshold_rsrp_int";

telephony/java/android/telephony/CarrierConfigManager.java

+31 −4
Original line number Diff line number Diff line
@@ -2371,33 +2371,54 @@ public class CarrierConfigManager { 
            "support_emergency_dialer_shortcut_bool";



    /**

     * Controls RSRP threshold at which AlternativeNetworkService will decide whether

     * Controls RSRP threshold at which OpportunisticNetworkService will decide whether

     * the opportunistic network is good enough for internet data.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT =

            "opportunistic_network_entry_threshold_rsrp_int";



    /**

     * Controls RSSNR threshold at which AlternativeNetworkService will decide whether

     * Controls RSSNR threshold at which OpportunisticNetworkService will decide whether

     * the opportunistic network is good enough for internet data.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSSNR_INT =

            "opportunistic_network_entry_threshold_rssnr_int";



    /**

     * Controls RSRP threshold below which AlternativeNetworkService will decide whether

     * Controls RSRP threshold below which OpportunisticNetworkService will decide whether

     * the opportunistic network available is not good enough for internet data.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSRP_INT =

            "opportunistic_network_exit_threshold_rsrp_int";



    /**

     * Controls RSSNR threshold below which AlternativeNetworkService will decide whether

     * Controls RSSNR threshold below which OpportunisticNetworkService will decide whether

     * the opportunistic network available is not good enough for internet data.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSSNR_INT =

            "opportunistic_network_exit_threshold_rssnr_int";



    /**

     * Controls bandwidth threshold in Kbps at which OpportunisticNetworkService will decide whether

     * the opportunistic network is good enough for internet data.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_BANDWIDTH_INT =

            "opportunistic_network_entry_threshold_bandwidth_int";



    /**

     * Controls hysteresis time in milli seconds for which OpportunisticNetworkService

     * will wait before attaching to a network.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG =

            "opportunistic_network_entry_or_exit_hysteresis_time_long";



    /**

     * Controls hysteresis time in milli seconds for which OpportunisticNetworkService

     * will wait before switching data to a network.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =

            "opportunistic_network_data_switch_hysteresis_time_long";



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

    private final static PersistableBundle sDefaults;
@@ -2764,6 +2785,12 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSSNR_INT, 45);

        /* Default value is minimum RSSNR level needed for SIGNAL_STRENGTH_MODERATE */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSSNR_INT, 10);

        /* Default value is 1024 kbps */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_BANDWIDTH_INT, 1024);

        /* Default value is 10 seconds */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG, 10000);

        /* Default value is 10 seconds. */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG, 10000);

    }



    /**