Merge "Enable skipping validation by default."

This commit is contained in:
Xiangyu/Malcolm Chen
2020-03-12 03:16:45 +00:00
committed by Gerrit Code Review

View File

@@ -37,6 +37,8 @@ import android.telephony.ims.ImsReasonInfo;
import com.android.internal.telephony.ICarrierConfigLoader; import com.android.internal.telephony.ICarrierConfigLoader;
import com.android.telephony.Rlog; import com.android.telephony.Rlog;
import java.util.concurrent.TimeUnit;
/** /**
* Provides access to telephony configuration values that are carrier-specific. * Provides access to telephony configuration values that are carrier-specific.
*/ */
@@ -4059,7 +4061,7 @@ public class CarrierConfigManager {
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
CellSignalStrengthLte.USE_RSRP); CellSignalStrengthLte.USE_RSRP);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, 0); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY, sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_ORIGINATOR_STRING_ARRAY,
new String[0]); new String[0]);
sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);