Merge "Extend canoical linger time" into main

2 files changed, 3 insertions, 4 deletions

diff --git a/src/java/com/android/internal/telephony/data/CellularNetworkValidator.java b/src/java/com/android/internal/telephony/data/CellularNetworkValidator.java
index d57059a5dc..cf3e7d7a67 100644
--- a/src/java/com/android/internal/telephony/data/CellularNetworkValidator.java
+++ b/src/java/com/android/internal/telephony/data/CellularNetworkValidator.java
@@ -342,11 +342,10 @@ public class CellularNetworkValidator {
         if (mState == STATE_VALIDATING) {
             mValidationCallback.onValidationDone(passed, mSubId);
             mState = STATE_VALIDATED;
-            boolean keepRequest = mFlags.keepPingRequest()
-                    ? (passed || !mRequireTestPass) : (!mRequireTestPass && passed);
+            boolean keepRequest = passed || !mRequireTestPass;
             // If validation passed and per request to NOT release after validation, delay cleanup.
             if (keepRequest) {
-                mHandler.postDelayed(this::stopValidation, 500);
+                mHandler.postDelayed(this::stopValidation, 5000);
             } else {
                 stopValidation();
             }
diff --git a/src/java/com/android/internal/telephony/data/PhoneSwitcher.java b/src/java/com/android/internal/telephony/data/PhoneSwitcher.java
index 66c2572952..f76db08be5 100644
--- a/src/java/com/android/internal/telephony/data/PhoneSwitcher.java
+++ b/src/java/com/android/internal/telephony/data/PhoneSwitcher.java
@@ -1618,7 +1618,7 @@ public class PhoneSwitcher extends Handler {
         mSetOpptSubCallback = callback;
         long validationTimeout = getValidationTimeout(subIdToValidate, needValidation);
         mValidator.validate(subIdToValidate, validationTimeout,
-                mFlags.keepPingRequest() && mPendingSwitchNeedValidation, mValidationCallback);
+                mPendingSwitchNeedValidation, mValidationCallback);
     }
 
     private long getValidationTimeout(int subId, boolean needValidation) {