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

Commit fdbe2583 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Expose KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG as public API"

parents d6af9659 5e82b6a5

core/api/current.txt

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

    field public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final String KEY_DATA_RAPID_NOTIFICATION_BOOL = "data_rapid_notification_bool";

    field public static final String KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG = "data_switch_validation_min_gap_long";

    field public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG = "data_switch_validation_timeout_long";

    field public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL = "data_warning_notification_bool";

    field public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

telephony/java/android/telephony/CarrierConfigManager.java

+23 −1
Original line number Diff line number Diff line
@@ -4884,10 +4884,31 @@ public class CarrierConfigManager { 
     * The max acceptable value of this config is 24 hours.

     *

     * @hide

     * @deprecated Use {@link #KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG} instead.

     */

    @Deprecated

    public static final String KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG =

            "data_switch_validation_min_gap_long";



    /**

     * Data switch validation minimal interval, in milliseconds.

     *

     * If a connection to the default (Internet) PDN for the current subscription is validated on

     * a given operator within a given tracking area, re-validations to that matching operator will

     * be skipped if they would occur within the specified interval. Instead, the connection will

     * automatically considered validated.

     *

     * If the network was validated within the interval but the latest validation result was false,

     * the validation will not be skipped. If not set or set to 0, validation will not be skipped.

     *

     * The valid range of value is between 0 millisecond and 24 hours, inclusive in both sides. The

     * default value is 24 hours.

     *

     * @see android.net.NetworkCapabilities#NET_CAPABILITY_VALIDATED

     */

    public static final String KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG =

            KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG;



    /**

     * A boolean property indicating whether this subscription should be managed as an opportunistic

     * subscription.
@@ -9335,7 +9356,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_GBA_UA_TLS_CIPHER_SUITE_INT, TlsParams.TLS_NULL_WITH_NULL_NULL);



        sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false);

        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));

        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG,

                TimeUnit.DAYS.toMillis(1));

        sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY,

                new String[0]);

        sDefaults.putStringArray(KEY_APN_PRIORITY_STRING_ARRAY, new String[] {