Merge "Shorten the timeout of DHCP INIT-REBOOT state." into rvc-dev

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();
         }