diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-06 13:15:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-06 13:15:04 +0000 |
| commit | 362b8c73dde5ffe16a320ba30485c91254bbee28 (patch) | |
| tree | a7c42be3e153487bdb92d8f9a653883a477f8252 /src | |
| parent | ee26afe80d3db10afaf693d6b384f25abea70c55 (diff) | |
| parent | 5ad0944d24e8dabc7fa56c3325e9200669889641 (diff) | |
Merge "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, 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; } |