{,Base}DhcpStateMachine is no more

am: efa4209fe0

* commit 'efa4209fe022d007f48edc3c4feaef00a9865cb5':
  {,Base}DhcpStateMachine is no more

diff --cc services/net/java/android/net/dhcp/DhcpClient.java
index 38551b6,5c7a78a..5229b40
--- 1/services/net/java/android/net/dhcp/DhcpClient.java
--- 2/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@@ -237,10 -235,10 +236,9 @@@ public class DhcpClient extends StateMa
          // Used to tell the caller when its request (CMD_START_DHCP or CMD_RENEW_DHCP) timed out.
          // TODO: when the legacy DHCP client is gone, make the client fully asynchronous and
          // remove this.
 -        mOneshotTimeoutIntent = createStateMachineCommandIntent("ONESHOT_TIMEOUT",
 -                CMD_ONESHOT_TIMEOUT);
 +        mOneshotTimeoutAlarm = makeWakeupMessage("ONESHOT_TIMEOUT", CMD_ONESHOT_TIMEOUT);
      }
  
-     @Override
      public void registerForPreDhcpNotification() {
          mRegisteredForPreDhcpNotification = true;
      }