Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a carrier config to specify validation timeout for data switch." into qt-qpr1-dev

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2019-11-05 21:51:28 +00:00
committed by Android (Google) Code Review
parent 7773a752ec f1239756b5
commit 94a58bd978
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/CarrierConfigManager.java Executable file → Normal file
View File

@@ -2797,6 +2797,16 @@ public class CarrierConfigManager {
public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN = public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN =
"always_show_primary_signal_bar_in_opportunistic_network_boolean"; "always_show_primary_signal_bar_in_opportunistic_network_boolean";
/**
* Upon data switching between subscriptions within a carrier group, if switch depends on
* validation result, this value defines customized value of how long we wait for validation
* success before we fail and revoke the switch.
* Time out is in milliseconds.
* @hide
*/
public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG =
"data_switch_validation_timeout_long";
/** /**
* GPS configs. See android.hardware.gnss@1.0 IGnssConfiguration. * GPS configs. See android.hardware.gnss@1.0 IGnssConfiguration.
* @hide * @hide
@@ -3542,6 +3552,7 @@ public class CarrierConfigManager {
}); });
sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);
sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
} }
/** /**