Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenzo Colitti
2016-04-28 07:02:06 +00:00
committed by Android (Google) Code Review
parent 4b74f4de64 adacedb1a8
commit d8a028af82
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -724,6 +724,7 @@ public class DhcpClient extends StateMachine {
mOffer = null; mOffer = null;
Log.d(TAG, "Confirmed lease: " + mDhcpLease); Log.d(TAG, "Confirmed lease: " + mDhcpLease);
setDhcpLeaseExpiry(packet); setDhcpLeaseExpiry(packet);
notifySuccess();
transitionTo(mConfiguringInterfaceState); transitionTo(mConfiguringInterfaceState);
} }
} else if (packet instanceof DhcpNakPacket) { } else if (packet instanceof DhcpNakPacket) {
@@ -794,7 +795,6 @@ public class DhcpClient extends StateMachine {
@Override @Override
public void enter() { public void enter() {
super.enter(); super.enter();
notifySuccess();
// TODO: DhcpStateMachine only supported renewing at 50% of the lease time, // 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. // and did not support rebinding. Now that the legacy DHCP client is gone, fix this.
scheduleRenew(); scheduleRenew();
@@ -850,6 +850,7 @@ public class DhcpClient extends StateMachine {
if (!isValidPacket(packet)) return; if (!isValidPacket(packet)) return;
if ((packet instanceof DhcpAckPacket)) { if ((packet instanceof DhcpAckPacket)) {
setDhcpLeaseExpiry(packet); setDhcpLeaseExpiry(packet);
notifySuccess();
transitionTo(mDhcpBoundState); transitionTo(mDhcpBoundState);
} else if (packet instanceof DhcpNakPacket) { } else if (packet instanceof DhcpNakPacket) {
transitionTo(mDhcpInitState); transitionTo(mDhcpInitState);