Merge "Support NAT-T keepalive packet filter" into qt-dev am: 38c255c8da

am: d43343cd05

Change-Id: I6e7fc58680c1687d251a4073b74f32ca0dc9918f

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);
                         }