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

Commit 634a124d authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Notify success before configuring the IP address." into nyc-dev 

am: d8a028af

* commit 'd8a028af':
  Notify success before configuring the IP address.

Change-Id: I8ec9e8f556e00b4609c7a631110d62c711a44740
parents 22ac9fea d8a028af

services/net/java/android/net/dhcp/DhcpClient.java

+2 −1
Original line number Diff line number Diff line
@@ -724,6 +724,7 @@ public class DhcpClient extends StateMachine { 
                    mOffer = null;

                    Log.d(TAG, "Confirmed lease: " + mDhcpLease);

                    setDhcpLeaseExpiry(packet);

                    notifySuccess();

                    transitionTo(mConfiguringInterfaceState);

                }

            } else if (packet instanceof DhcpNakPacket) {
@@ -794,7 +795,6 @@ public class DhcpClient extends StateMachine { 
        @Override

        public void enter() {

            super.enter();

            notifySuccess();

            // TODO: DhcpStateMachine only supported renewing at 50% of the lease time,

            // and did not support rebinding. Now that the legacy DHCP client is gone, fix this.

            scheduleRenew();
@@ -850,6 +850,7 @@ public class DhcpClient extends StateMachine { 
            if (!isValidPacket(packet)) return;

            if ((packet instanceof DhcpAckPacket)) {

                setDhcpLeaseExpiry(packet);

                notifySuccess();

                transitionTo(mDhcpBoundState);

            } else if (packet instanceof DhcpNakPacket) {

                transitionTo(mDhcpInitState);