diff options
| author | Aswin Sankar <apsankar@google.com> | 2023-03-31 03:56:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-31 03:56:40 +0000 |
| commit | 01290972a903980b9808b7fa5fb6fa436ccac7ca (patch) | |
| tree | 0f2a17b1da1d43a1f71e8b5e5c4eab9f3f272528 | |
| parent | 8a99671f09a818ae6b3fbbb72b12de34f88e91a2 (diff) | |
| parent | cd544c0d164928c9ed5567dcd6225a9979df8941 (diff) | |
| download | Iwlan-01290972a903980b9808b7fa5fb6fa436ccac7ca.tar.gz | |
Merge "Increase IWLAN DNS resolver timeout to 6 seconds" am: 1ede5a1b27 am: cd544c0d16
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2514841
Change-Id: Idd47958a22ec40ebd22495ea8d3c3cf7087a95c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/google/android/iwlan/epdg/EpdgSelector.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/google/android/iwlan/epdg/EpdgSelector.java b/src/com/google/android/iwlan/epdg/EpdgSelector.java index d57fdef..7dda188 100644 --- a/src/com/google/android/iwlan/epdg/EpdgSelector.java +++ b/src/com/google/android/iwlan/epdg/EpdgSelector.java @@ -80,7 +80,9 @@ public class EpdgSelector { private byte[] mV6PcoData = null; @NonNull private final ErrorPolicyManager mErrorPolicyManager; - private static final long DNS_RESOLVER_TIMEOUT_DURATION_SEC = 5L; + // The default DNS timeout in the DNS module is set to 5 seconds. To account for IPC overhead, + // IWLAN applies an internal timeout of 6 seconds, slightly longer than the default timeout + private static final long DNS_RESOLVER_TIMEOUT_DURATION_SEC = 6L; private static final long PARALLEL_DNS_RESOLVER_TIMEOUT_DURATION_SEC = 20L; private static final int NUM_EPDG_SELECTION_EXECUTORS = 2; // 1 each for normal selection, SOS. |