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

Remove references to BaseDhcpStateMachine and DhcpStateMachine

Browse Source 
Bug: 26991160
Change-Id: I3742780a4e5121c163d9d1380951e25edaba19f3
This commit is contained in:
Erik Kline
2016-02-17 21:44:25 +09:00
parent b1ee39540e
commit 29a215268d
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,8 +27,8 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.DhcpResults;
import android.net.BaseDhcpStateMachine;
import android.net.DhcpResults;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.NetworkUtils;
@@ -247,6 +247,11 @@ public class DhcpClient extends BaseDhcpStateMachine {
public static BaseDhcpStateMachine makeDhcpStateMachine(
Context context, StateMachine controller, String intf) {
return makeDhcpClient(context, controller, intf);
}
public static DhcpClient makeDhcpClient(
Context context, StateMachine controller, String intf) {
DhcpClient client = new DhcpClient(context, controller, intf);
client.start();
return client;
@@ -866,7 +871,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
super.enter();
cancelOneshotTimeout();
notifySuccess();
// TODO: DhcpStateMachine only supports renewing at 50% of the lease time, and does not
// TODO: DhcpStateMachine only supported renewing at 50% of the lease time, and did not
// support rebinding. Once the legacy DHCP client is gone, fix this.
scheduleRenew();
}
@@ -929,7 +934,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
}
}
// Not implemented. DhcpStateMachine does not implement it either.
// Not implemented. DhcpStateMachine did not implement it either.
class DhcpRebindingState extends LoggingState {
}

48
services/net/java/android/net/ip/IpManager.java
View File

@@ -17,9 +17,7 @@
package android.net.ip;
import android.content.Context;
import android.net.BaseDhcpStateMachine;
import android.net.DhcpResults;
import android.net.DhcpStateMachine;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.LinkProperties;
@@ -31,7 +29,6 @@ import android.os.INetworkManagementService;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
@@ -185,7 +182,7 @@ public class IpManager extends StateMachine {
* Non-final member variables accessed only from within our StateMachine.
*/
private IpReachabilityMonitor mIpReachabilityMonitor;
private BaseDhcpStateMachine mDhcpStateMachine;
private DhcpClient mDhcpClient;
private DhcpResults mDhcpResults;
private ProvisioningConfiguration mConfiguration;
@@ -619,7 +616,7 @@ public class IpManager extends StateMachine {
class StoppingState extends State {
@Override
public void enter() {
if (mDhcpStateMachine == null) {
if (mDhcpClient == null) {
// There's no DHCPv4 for which to wait; proceed to stopped.
transitionTo(mStoppedState);
}
@@ -629,7 +626,7 @@ public class IpManager extends StateMachine {
public boolean processMessage(Message msg) {
switch (msg.what) {
case DhcpClient.CMD_ON_QUIT:
mDhcpStateMachine = null;
mDhcpClient = null;
transitionTo(mStoppedState);
break;
@@ -678,9 +675,12 @@ public class IpManager extends StateMachine {
}
} else {
// Start DHCPv4.
makeDhcpStateMachine();
mDhcpStateMachine.registerForPreDhcpNotification();
mDhcpStateMachine.sendMessage(DhcpClient.CMD_START_DHCP);
mDhcpClient = DhcpClient.makeDhcpClient(
mContext,
IpManager.this,
mInterfaceName);
mDhcpClient.registerForPreDhcpNotification();
mDhcpClient.sendMessage(DhcpClient.CMD_START_DHCP);
}
}
@@ -691,9 +691,9 @@ public class IpManager extends StateMachine {
mIpReachabilityMonitor = null;
}
if (mDhcpStateMachine != null) {
mDhcpStateMachine.sendMessage(DhcpClient.CMD_STOP_DHCP);
mDhcpStateMachine.doQuit();
if (mDhcpClient != null) {
mDhcpClient.sendMessage(DhcpClient.CMD_STOP_DHCP);
mDhcpClient.doQuit();
}
resetLinkProperties();
@@ -724,8 +724,8 @@ public class IpManager extends StateMachine {
// It's possible to reach here if, for example, someone
// calls completedPreDhcpAction() after provisioning with
// a static IP configuration.
if (mDhcpStateMachine != null) {
mDhcpStateMachine.sendMessage(DhcpClient.CMD_PRE_DHCP_ACTION_COMPLETE);
if (mDhcpClient != null) {
mDhcpClient.sendMessage(DhcpClient.CMD_PRE_DHCP_ACTION_COMPLETE);
}
break;
@@ -775,7 +775,7 @@ public class IpManager extends StateMachine {
case DhcpClient.CMD_ON_QUIT:
// DHCPv4 quit early for some reason.
Log.e(mTag, "Unexpected CMD_ON_QUIT.");
mDhcpStateMachine = null;
mDhcpClient = null;
break;
default:
@@ -798,23 +798,5 @@ public class IpManager extends StateMachine {
return true;
}
private void makeDhcpStateMachine() {
final boolean usingLegacyDhcp = (Settings.Global.getInt(
mContext.getContentResolver(),
Settings.Global.LEGACY_DHCP_CLIENT, 0) == 1);
if (usingLegacyDhcp) {
mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(
mContext,
IpManager.this,
mInterfaceName);
} else {
mDhcpStateMachine = DhcpClient.makeDhcpStateMachine(
mContext,
IpManager.this,
mInterfaceName);
}
}
}
}