From 57b574e2677f042b6b72a86bc8f9d71b1a806ef4 Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Wed, 19 Feb 2020 15:21:22 -0800
Subject: [PATCH] Enable skipping validation by default.

Set KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG to 24 hours to enable
validation skipping if network is validated in the last 24 hours.

Bug: 140070796
Test: unittest
Change-Id: I07b087d731ed1661e5b0c51407ea3003769a3fd9
---
 telephony/java/android/telephony/CarrierConfigManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5c6ca45743970..c833e6a0eaf0d 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -36,6 +36,8 @@ import android.telephony.ims.ImsReasonInfo;
 import com.android.internal.telephony.ICarrierConfigLoader;
 import com.android.telephony.Rlog;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Provides access to telephony configuration values that are carrier-specific.
  */
@@ -4007,7 +4009,7 @@ public class CarrierConfigManager {
         sDefaults.putAll(Wifi.getDefaults());
         sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);
         sDefaults.putBoolean(KEY_SHOW_FORWARDED_NUMBER_BOOL, false);
-        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, 0);
+        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG, TimeUnit.DAYS.toMillis(1));
     }
 
     /**