summaryrefslogtreecommitdiffstats
path: root/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
diff options
context:
space:
mode:
authorjunyulai <junyulai@google.com>2019-01-03 19:24:05 +0800
committerChalard Jean <jchalard@google.com>2019-02-03 20:44:45 +0900
commit34e204f3619d225b85726876b310204de3bfc3d1 (patch)
tree3269b4828fbb28447f70b31f4718a46ddd033f57 /tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
parent264786ccd6091065fd2eda180a00d02031fea86f (diff)
downloadandroid_frameworks_opt_net_wifi-34e204f3619d225b85726876b310204de3bfc3d1.tar.gz
android_frameworks_opt_net_wifi-34e204f3619d225b85726876b310204de3bfc3d1.tar.bz2
android_frameworks_opt_net_wifi-34e204f3619d225b85726876b310204de3bfc3d1.zip
[KA02] internal cleanup and refactor for SocketKeepalive
In previous change, the new SocketKeepalive API was exported. But internally, old PacketKeepalive names and structures are still used. This change rename them properly for code consistency and also refactor KeepalivePacketData to support different types of KeepalivePacketData. Bug: 114151147 Test: 1. atest FrameworksNetTests 2. atest FrameworksWifiTests 3. atest FrameworksTelephonyTests Change-Id: If1345fd3c3ad6cce3074c532386da3befe211795 Merged-In: If1345fd3c3ad6cce3074c532386da3befe211795
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
index f089ebbe7..d16473505 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
@@ -81,6 +81,7 @@ import android.hardware.wifi.V1_2.IWifiChipEventCallback.IfaceInfo;
import android.hardware.wifi.V1_2.IWifiChipEventCallback.RadioModeInfo;
import android.net.KeepalivePacketData;
import android.net.MacAddress;
+import android.net.NattKeepalivePacketData;
import android.net.apf.ApfCapabilities;
import android.net.wifi.RttManager;
import android.net.wifi.ScanResult;
@@ -1112,7 +1113,8 @@ public class WifiVendorHalTest {
int slot = 13;
int millis = 16000;
- KeepalivePacketData kap = KeepalivePacketData.nattKeepalivePacket(src, 63000, dst, 4500);
+ KeepalivePacketData kap =
+ NattKeepalivePacketData.nattKeepalivePacket(src, 63000, dst, 4500);
when(mIWifiStaIface.startSendingKeepAlivePackets(
anyInt(), any(), anyShort(), any(), any(), anyInt()