diff options
| author | Neil Fuller <nfuller@google.com> | 2019-06-26 06:27:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 06:27:48 -0700 |
| commit | 2c361dd14f6596650096e1ef608add2fd1ba4bf9 (patch) | |
| tree | 162f0c6a3ca78ac21ad14a0beb94a341d249d46c | |
| parent | 9bed101b79a64a2a7944e29c48700b3ac27b746d (diff) | |
| parent | 51b4202ea5abc9b731118b2d939caf6932ae0e88 (diff) | |
Merge "Remove unnecessary casts" am: 6c22b3fd3e
am: 51b4202ea5
Change-Id: I361808bf8556b5e0dab50ec8c7556544d534a253
| -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); |