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

Commit 6c41f0ab authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Enable skipping validation by default." am: dc4985f4 

Change-Id: Ia73faddce7d5958613bd9c3a6490c39c7b1635d8
parents 2b082ce7 dc4985f4

telephony/java/android/telephony/CarrierConfigManager.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -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]);