Merge "Revert "Fix sll_protocol in DhcpClient packet socket""

3 files changed, 4 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 35eaf6c..f17f1b1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,7 +59,7 @@ filegroup {
     srcs: [
         "apishim/common/**/*.java",
         "apishim/29/**/*.java",
-        "apishim/30/**/*.java",
+        "apishim/current/**/*.java",
         ":net-module-utils-srcs",
     ],
 }
diff --git a/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java b/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java
index 748878a..9516e7c 100644
--- a/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java
+++ b/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java
@@ -44,6 +44,7 @@ public class SocketUtilsShimImpl
     @Override
     public SocketAddress makePacketSocketAddress(
             int protocol, int ifIndex, @NonNull byte[] hwAddr) {
-        return SocketUtils.makePacketSocketAddress(protocol, ifIndex, hwAddr);
+        // TODO: use new API (which takes protocol, ifIndex, hwAddr) once implemented
+        return SocketUtils.makePacketSocketAddress(ifIndex, hwAddr);
     }
 }
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java
index 889bfce..0d56d63 100644
--- a/src/android/net/dhcp/DhcpClient.java
+++ b/src/android/net/dhcp/DhcpClient.java
@@ -82,7 +82,6 @@ import com.android.internal.util.StateMachine;
 import com.android.internal.util.TrafficStatsConstants;
 import com.android.internal.util.WakeupMessage;
 import com.android.networkstack.R;
-import com.android.networkstack.apishim.SocketUtilsShimImpl;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -390,8 +389,7 @@ public class DhcpClient extends StateMachine {
         }
 
         mHwAddr = mIface.macAddr.toByteArray();
-        mInterfaceBroadcastAddr = SocketUtilsShimImpl.newInstance().makePacketSocketAddress(
-                ETH_P_IP, mIface.index, DhcpPacket.ETHER_BROADCAST);
+        mInterfaceBroadcastAddr = makePacketSocketAddress(mIface.index, DhcpPacket.ETHER_BROADCAST);
         return true;
     }