diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-05-10 00:57:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-10 00:57:43 +0000 |
| commit | 38c255c8dac4910fafa590c3ec37e73aa474e02b (patch) | |
| tree | 9b2e2699fa04b607d193987dd8bc0b1a7066713e /service/java/com/android | |
| parent | 0f3d5bff93018e192997d9fd59ced66932eb6129 (diff) | |
| parent | 8e2681794b9a0b28a5c847cde83f99f9d23904fc (diff) | |
| download | android_frameworks_opt_net_wifi-38c255c8dac4910fafa590c3ec37e73aa474e02b.tar.gz android_frameworks_opt_net_wifi-38c255c8dac4910fafa590c3ec37e73aa474e02b.tar.bz2 android_frameworks_opt_net_wifi-38c255c8dac4910fafa590c3ec37e73aa474e02b.zip | |
Merge "Support NAT-T keepalive packet filter" into qt-dev
Diffstat (limited to 'service/java/com/android')
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index c0ff441a7..6ce5dade0 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -41,6 +41,7 @@ import android.net.KeepalivePacketData; import android.net.LinkProperties; import android.net.MacAddress; import android.net.MatchAllNetworkSpecifier; +import android.net.NattKeepalivePacketData; import android.net.Network; import android.net.NetworkAgent; import android.net.NetworkCapabilities; @@ -5238,9 +5239,18 @@ public class ClientModeImpl extends StateMachine { case CMD_ADD_KEEPALIVE_PACKET_FILTER_TO_APF: { if (mIpClient != null) { final int slot = message.arg1; - final TcpKeepalivePacketData pkt = (TcpKeepalivePacketData) message.obj; try { - mIpClient.addKeepalivePacketFilter(slot, pkt.toStableParcelable()); + if (message.obj instanceof NattKeepalivePacketData) { + final NattKeepalivePacketData pkt = + (NattKeepalivePacketData) message.obj; + mIpClient.addNattKeepalivePacketFilter(slot, + pkt.toStableParcelable()); + } else if (message.obj instanceof TcpKeepalivePacketData) { + final TcpKeepalivePacketData pkt = + (TcpKeepalivePacketData) message.obj; + mIpClient.addKeepalivePacketFilter(slot, + pkt.toStableParcelable()); + } } catch (RemoteException e) { loge("Error adding Keepalive Packet Filter ", e); } |