OSDN Git Service

Relocate KeepalivePacketData to frameworks/base
authorNathan Harold <nharold@google.com>
Fri, 3 Nov 2017 04:01:46 +0000 (21:01 -0700)
committerNathan Harold <nharold@google.com>
Wed, 24 Jan 2018 18:26:04 +0000 (10:26 -0800)
commit41002e3080461ba6a7aee12c1d12dd13edc8626c
tree2ba1b78ada9c4c020c44e27596a76f13286324c5
parentadb4fc73b0d9be2ad5f76c9e7248440625b80b75
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)
core/java/android/net/KeepalivePacketData.java [moved from services/core/java/com/android/server/connectivity/KeepalivePacketData.java with 99% similarity]
core/java/android/net/util/IpUtils.java [moved from services/net/java/android/net/util/IpUtils.java with 100% similarity]
services/core/java/com/android/server/connectivity/KeepaliveTracker.java