1 files changed, 5 insertions, 13 deletions
diff --git a/services/net/java/android/net/dhcp/DhcpNakPacket.java b/services/net/java/android/net/dhcp/DhcpNakPacket.java
index 1f340ad..1390ea7 100644
--- a/services/net/java/android/net/dhcp/DhcpNakPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpNakPacket.java
@@ -16,7 +16,6 @@
 
 package android.net.dhcp;
 
-import java.net.InetAddress;
 import java.net.Inet4Address;
 import java.nio.ByteBuffer;
 
@@ -27,10 +26,10 @@ class DhcpNakPacket extends DhcpPacket {
     /**
      * Generates a NAK packet with the specified parameters.
      */
-    DhcpNakPacket(int transId, InetAddress clientIp, InetAddress yourIp,
-                  InetAddress nextIp, InetAddress relayIp,
+    DhcpNakPacket(int transId, Inet4Address clientIp, Inet4Address yourIp,
+                  Inet4Address nextIp, Inet4Address relayIp,
                   byte[] clientMac) {
-        super(transId, Inet4Address.ANY, Inet4Address.ANY, nextIp, relayIp,
+        super(transId, INADDR_ANY, INADDR_ANY, nextIp, relayIp,
             clientMac, false);
     }
 
@@ -44,8 +43,8 @@ class DhcpNakPacket extends DhcpPacket {
      */
     public ByteBuffer buildPacket(int encap, short destUdp, short srcUdp) {
         ByteBuffer result = ByteBuffer.allocate(MAX_LENGTH);
-        InetAddress destIp = mClientIp;
-        InetAddress srcIp = mYourIp;
+        Inet4Address destIp = mClientIp;
+        Inet4Address srcIp = mYourIp;
 
         fillInPacket(encap, destIp, srcIp, destUdp, srcUdp, result,
             DHCP_BOOTREPLY, mBroadcast);
@@ -62,11 +61,4 @@ class DhcpNakPacket extends DhcpPacket {
         addTlv(buffer, DHCP_MESSAGE, mMessage);
         addTlvEnd(buffer);
     }
-
-    /**
-     * Notifies the specified state machine of the newly-arrived NAK packet.
-     */
-    public void doNextOp(DhcpStateMachine machine) {
-        machine.onNakReceived();
-    }
 }