diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-06 13:11:49 +0000 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-11-06 13:11:49 +0000 |
| commit | 5ad0944d24e8dabc7fa56c3325e9200669889641 (patch) | |
| tree | 0b0dfe2fa5df46011318592e8433daea840ed78c /src/android/net | |
| parent | 0c5e74000546a6c148e79985ee5fbf53dc454453 (diff) | |
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
Diffstat (limited to 'src/android/net')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 4 |
1 files changed, 1 insertions, 3 deletions
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; } |