diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-06 08:44:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-06 08:44:34 +0000 |
| commit | ee26afe80d3db10afaf693d6b384f25abea70c55 (patch) | |
| tree | b09b4e062c91e6573c4ecd85cdf1c035d8d3cab6 /src | |
| parent | 7d5191f51514cd679c95b1586a6b9359002ccd03 (diff) | |
| parent | 0c5e74000546a6c148e79985ee5fbf53dc454453 (diff) | |
Merge "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; } |