Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6e1da68 authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Shorten the timeout of DHCP INIT-REBOOT state." am: 29f5f861 am:... 

Merge "Shorten the timeout of DHCP INIT-REBOOT state." am: 29f5f861 am: e3c6e9fc am: 93e0869d am: 2f062fad am: 2e49e2d6

Original change: undetermined

Change-Id: I59d8971f760fa1bd08344bba41a7df4c05a6cba5
parents 9d5cc530 2e49e2d6

src/android/net/dhcp/DhcpClient.java

+2 −0
Original line number Diff line number Diff line
@@ -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();

        }