diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 17 | ||||
| -rw-r--r-- | src/android/net/ip/IpClient.java | 13 |
2 files changed, 13 insertions, 17 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index dc0175e..982d8ce 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -231,7 +231,8 @@ public class DhcpClient extends StateMachine { private static final int PRIVATE_BASE = IpClient.DHCPCLIENT_CMD_BASE + 100; private static final int CMD_KICK = PRIVATE_BASE + 1; private static final int CMD_RECEIVED_PACKET = PRIVATE_BASE + 2; - private static final int CMD_TIMEOUT = PRIVATE_BASE + 3; + @VisibleForTesting + public static final int CMD_TIMEOUT = PRIVATE_BASE + 3; private static final int CMD_RENEW_DHCP = PRIVATE_BASE + 4; private static final int CMD_REBIND_DHCP = PRIVATE_BASE + 5; private static final int CMD_EXPIRE_DHCP = PRIVATE_BASE + 6; @@ -888,11 +889,8 @@ public class DhcpClient extends StateMachine { mConfiguration = (Configuration) message.obj; if (mConfiguration.isPreconnectionEnabled) { transitionTo(mDhcpPreconnectingState); - } else if (isDhcpLeaseCacheEnabled()) { - preDhcpTransitionTo(mWaitBeforeObtainingConfigurationState, - mObtainingConfigurationState); } else { - preDhcpTransitionTo(mWaitBeforeStartState, mDhcpInitState); + startInitRebootOrInit(); } return HANDLED; default: @@ -1267,15 +1265,6 @@ public class DhcpClient extends StateMachine { l2Packet.payload = packet.array(); mController.sendMessage(CMD_START_PRECONNECTION, l2Packet); } - - private void startInitRebootOrInit() { - if (isDhcpLeaseCacheEnabled()) { - preDhcpTransitionTo(mWaitBeforeObtainingConfigurationState, - mObtainingConfigurationState); - } else { - preDhcpTransitionTo(mWaitBeforeStartState, mDhcpInitState); - } - } } // Not implemented. We request the first offer we receive. diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 8e95ab5..2fb73a0 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -39,7 +39,6 @@ import android.net.TcpKeepalivePacketDataParcelable; import android.net.apf.ApfCapabilities; import android.net.apf.ApfFilter; import android.net.dhcp.DhcpClient; -import android.net.dhcp.DhcpClient.Configuration; import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpManagerEvent; import android.net.shared.InitialConfiguration; @@ -478,6 +477,14 @@ public class IpClient extends StateMachine { } /** + * Get a DhcpClient instance. + */ + public DhcpClient makeDhcpClient(Context context, StateMachine controller, + InterfaceParams ifParams, DhcpClient.Dependencies deps) { + return DhcpClient.makeDhcpClient(context, controller, ifParams, deps); + } + + /** * Get a DhcpClient Dependencies instance. */ public DhcpClient.Dependencies getDhcpClientDependencies( @@ -1518,7 +1525,7 @@ public class IpClient extends StateMachine { private void startDhcpClient() { // Start DHCPv4. - mDhcpClient = DhcpClient.makeDhcpClient(mContext, IpClient.this, mInterfaceParams, + mDhcpClient = mDependencies.makeDhcpClient(mContext, IpClient.this, mInterfaceParams, mDependencies.getDhcpClientDependencies(mIpMemoryStore)); // If preconnection is enabled, there is no need to ask Wi-Fi to disable powersaving @@ -1527,7 +1534,7 @@ public class IpClient extends StateMachine { // registerForPreDhcpNotification is called later when processing the CMD_*_PRECONNECTION // messages. if (!isUsingPreconnection()) mDhcpClient.registerForPreDhcpNotification(); - mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP, new Configuration(mL2Key, + mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP, new DhcpClient.Configuration(mL2Key, isUsingPreconnection())); } |