From 5ad0944d24e8dabc7fa56c3325e9200669889641 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 6 Nov 2019 13:11:49 +0000 Subject: Revert "Fix sll_protocol in DhcpClient packet socket" This reverts commit 0c5e74000546a6c148e79985ee5fbf53dc454453. Reason for revert: Broke build in qt-qpr1-dev-plus-aosp Change-Id: I2e5738e776881f8c4f3cf459398a250560a43559 --- src/android/net/dhcp/DhcpClient.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3