diff options
| author | Neil Fuller <nfuller@google.com> | 2019-06-20 17:17:05 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2019-06-26 12:56:13 +0000 |
| commit | daa8a6c63544de459bac9271c90eed6c7299b136 (patch) | |
| tree | e16df4ed41e925ff88b6cf578def11b4b18bb634 /src | |
| parent | 8203fa466ace8b57bed171982c741c334b70a3ba (diff) | |
Remove unnecessary casts
makePacketSocketAddress() takes an int parameter.
Bug: 130787951
Test: build
Test: atest NetworkStackIntegrationTests
Change-Id: Ied5df7955ba3598b6a8050854648fc5f354bd006
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/apf/ApfFilter.java | 3 | ||||
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 2 | ||||
| -rw-r--r-- | src/android/net/ip/ConnectivityPacketTracker.java | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java index f054319..6075f69 100644 --- a/src/android/net/apf/ApfFilter.java +++ b/src/android/net/apf/ApfFilter.java @@ -476,8 +476,7 @@ public class ApfFilter { installNewProgramLocked(); } socket = Os.socket(AF_PACKET, SOCK_RAW, ETH_P_IPV6); - SocketAddress addr = makePacketSocketAddress( - (short) ETH_P_IPV6, mInterfaceParams.index); + SocketAddress addr = makePacketSocketAddress(ETH_P_IPV6, mInterfaceParams.index); Os.bind(socket, addr); NetworkStackUtils.attachRaFilter(socket, mApfCapabilities.apfPacketFormat); } catch(SocketException|ErrnoException e) { diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index bd36d16..0ed81a3 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -371,7 +371,7 @@ public class DhcpClient extends StateMachine { private boolean initPacketSocket() { try { mPacketSock = Os.socket(AF_PACKET, SOCK_RAW, ETH_P_IP); - SocketAddress addr = makePacketSocketAddress((short) ETH_P_IP, mIface.index); + SocketAddress addr = makePacketSocketAddress(ETH_P_IP, mIface.index); Os.bind(mPacketSock, addr); NetworkStackUtils.attachDhcpFilter(mPacketSock); } catch(SocketException|ErrnoException e) { diff --git a/src/android/net/ip/ConnectivityPacketTracker.java b/src/android/net/ip/ConnectivityPacketTracker.java index eb49218..dc793cd 100644 --- a/src/android/net/ip/ConnectivityPacketTracker.java +++ b/src/android/net/ip/ConnectivityPacketTracker.java @@ -104,7 +104,7 @@ public class ConnectivityPacketTracker { try { s = Os.socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, 0); NetworkStackUtils.attachControlPacketFilter(s, ARPHRD_ETHER); - Os.bind(s, makePacketSocketAddress((short) ETH_P_ALL, mInterface.index)); + Os.bind(s, makePacketSocketAddress(ETH_P_ALL, mInterface.index)); } catch (ErrnoException | IOException e) { logError("Failed to create packet tracking socket: ", e); closeFd(s); |