Relocate KeepalivePacketData to frameworks/base
Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services;
Update references in wifi to point to the new package
name, android.net.
Bug: 38350389
Test: compilation
Merged-In: I620933b6d5bbf0177c4dda9e2f4933e5c2a63310
Change-Id: I620933b6d5bbf0177c4dda9e2f4933e5c2a63310
(cherry picked from commit 505663e1f5ecfd9ec588f5d9073915a5f0a9ecc1)
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 5b12a36..14d832a 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -17,6 +17,7 @@
package com.android.server.wifi;
import android.annotation.Nullable;
+import android.net.KeepalivePacketData;
import android.net.apf.ApfCapabilities;
import android.net.wifi.IApInterface;
import android.net.wifi.IClientInterface;
@@ -34,7 +35,6 @@
import com.android.internal.annotations.Immutable;
import com.android.internal.util.HexDump;
-import com.android.server.connectivity.KeepalivePacketData;
import com.android.server.wifi.util.FrameParser;
import java.io.PrintWriter;
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 2eab721..033abab 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -45,6 +45,7 @@
import android.net.ConnectivityManager;
import android.net.DhcpResults;
import android.net.IpConfiguration;
+import android.net.KeepalivePacketData;
import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkAgent;
@@ -113,7 +114,6 @@
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
-import com.android.server.connectivity.KeepalivePacketData;
import com.android.server.wifi.hotspot2.AnqpEvent;
import com.android.server.wifi.hotspot2.IconEvent;
import com.android.server.wifi.hotspot2.NetworkDetail;
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index 12674aa..842c05d 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -54,6 +54,7 @@
import android.hardware.wifi.V1_0.WifiInformationElement;
import android.hardware.wifi.V1_0.WifiStatus;
import android.hardware.wifi.V1_0.WifiStatusCode;
+import android.net.KeepalivePacketData;
import android.net.apf.ApfCapabilities;
import android.net.wifi.RttManager;
import android.net.wifi.RttManager.ResponderConfig;
@@ -72,7 +73,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
-import com.android.server.connectivity.KeepalivePacketData;
import com.android.server.wifi.util.BitMask;
import com.android.server.wifi.util.NativeUtil;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
index 84de9d2..31e7701 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
@@ -48,6 +48,7 @@
import android.hardware.wifi.V1_0.WifiInformationElement;
import android.hardware.wifi.V1_0.WifiStatus;
import android.hardware.wifi.V1_0.WifiStatusCode;
+import android.net.KeepalivePacketData;
import android.net.apf.ApfCapabilities;
import android.net.wifi.RttManager;
import android.net.wifi.ScanResult;
@@ -61,7 +62,6 @@
import android.os.test.TestLooper;
import android.util.Pair;
-import com.android.server.connectivity.KeepalivePacketData;
import com.android.server.wifi.util.NativeUtil;
import static org.junit.Assert.*;
