diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-04 10:50:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 10:50:27 +0000 |
| commit | 47e8610c057a41d263fdcb111c6512716c5af8ee (patch) | |
| tree | 2cc4ff710657b00cb256ea26b04ee067932e4e68 | |
| parent | b4365bb841182d90bf37534496c1149e435c31d4 (diff) | |
| parent | 333e87fa1181b2af82095616976922b6cd3c65f5 (diff) | |
Merge "Shorten the timeout of DHCP INIT-REBOOT state." into rvc-dev am: d431edc192 am: 333e87fa11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11707546
Change-Id: I28005537aa6d1537a60b230816b5925c01a4dbca
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index e19ac79..5564503 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -154,6 +154,7 @@ public class DhcpClient extends StateMachine { private static final int FIRST_TIMEOUT_MS = 1 * SECONDS; private static final int MAX_TIMEOUT_MS = 512 * SECONDS; private static final int IPMEMORYSTORE_TIMEOUT_MS = 1 * SECONDS; + private static final int DHCP_INITREBOOT_TIMEOUT_MS = 5 * SECONDS; // The waiting time to restart the DHCP configuration process after broadcasting a // DHCPDECLINE message, (RFC2131 3.1.5 describes client SHOULD wait a minimum of 10 @@ -1814,6 +1815,7 @@ public class DhcpClient extends StateMachine { class DhcpInitRebootState extends DhcpRequestingState { @Override public void enter() { + mTimeout = DHCP_INITREBOOT_TIMEOUT_MS; super.enter(); startNewTransaction(); } |