diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 24 |
2 files changed, 24 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4c1594b19409..cf3938ade32d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 17780af8061c..329849bd7682 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4884,11 +4884,32 @@ 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[] { |