diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-12 00:47:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-12 00:47:56 +0000 |
| commit | c6ba801b9fb53de41124c2f7c82c3c58fab7286e (patch) | |
| tree | 7af13b820429bb59030e7abf7fad153d2dcbf475 /src | |
| parent | 65cbd15ead4a9058bfe07507c4471e7db856c64d (diff) | |
| parent | f9c9b71cccaa66826876046edd8c101141928967 (diff) | |
Merge "Revert "Revert "Fix sll_protocol in DhcpClient packet socket"""
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index 0d56d63..889bfce 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -82,6 +82,7 @@ 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; @@ -389,7 +390,8 @@ public class DhcpClient extends StateMachine { } mHwAddr = mIface.macAddr.toByteArray(); - mInterfaceBroadcastAddr = makePacketSocketAddress(mIface.index, DhcpPacket.ETHER_BROADCAST); + mInterfaceBroadcastAddr = SocketUtilsShimImpl.newInstance().makePacketSocketAddress( + ETH_P_IP, mIface.index, DhcpPacket.ETHER_BROADCAST); return true; } |