diff options
| author | 2017-11-02 21:01:46 -0700 | |
|---|---|---|
| committer | 2018-01-24 10:26:04 -0800 | |
| commit | 41002e3080461ba6a7aee12c1d12dd13edc8626c (patch) | |
| tree | 2ba1b78ada9c4c020c44e27596a76f13286324c5 | |
| parent | adb4fc73b0d9be2ad5f76c9e7248440625b80b75 (diff) | |
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.
-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
name.
Bug: 38350389
Test: compilation
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit bd4093be7cab51d6ad031854324134a9c8637c2c)
| -rw-r--r-- | core/java/android/net/KeepalivePacketData.java (renamed from services/core/java/com/android/server/connectivity/KeepalivePacketData.java) | 2 | ||||
| -rw-r--r-- | core/java/android/net/util/IpUtils.java (renamed from services/net/java/android/net/util/IpUtils.java) | 0 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/KeepaliveTracker.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/connectivity/KeepalivePacketData.java b/core/java/android/net/KeepalivePacketData.java index f6b73b7d6949..84892c6a55a1 100644 --- a/services/core/java/com/android/server/connectivity/KeepalivePacketData.java +++ b/core/java/android/net/KeepalivePacketData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.connectivity; +package android.net; import static android.net.util.NetworkConstants.IPV4_HEADER_MIN_LEN; import static android.net.util.NetworkConstants.UDP_HEADER_LEN; diff --git a/services/net/java/android/net/util/IpUtils.java b/core/java/android/net/util/IpUtils.java index e037c4035aca..e037c4035aca 100644 --- a/services/net/java/android/net/util/IpUtils.java +++ b/core/java/android/net/util/IpUtils.java diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 9e1f6b85ce39..f1af7042be3e 100644 --- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java +++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java @@ -18,10 +18,10 @@ package com.android.server.connectivity; import com.android.internal.util.HexDump; import com.android.internal.util.IndentingPrintWriter; -import com.android.server.connectivity.KeepalivePacketData; import com.android.server.connectivity.NetworkAgentInfo; import android.net.ConnectivityManager; import android.net.ConnectivityManager.PacketKeepalive; +import android.net.KeepalivePacketData; import android.net.LinkAddress; import android.net.NetworkAgent; import android.net.NetworkUtils; |