summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aaron Huang <huangaaron@google.com> 2019-04-23 22:48:59 -0700
committer markchien <markchien@google.com> 2019-04-29 20:24:24 +0800
commitf360cbd9e75e7d2f25c3fcf476f3bc8641f34ef9 (patch)
tree1d2b1f432ade91824a4b6adc16db61da4bf698b6
parent606f1c9ffb1c74dd5648455feef64e6daae72cac (diff)
Move NattKeepalivePacketData out of the framework
For implementing parcelable interface for NattKeepalivePacketData. Move this class out of framework.jar and move to services.jar This class is used in telephony-common.jar and it also loads service.jar. Bug: 33530442 Test: - build pass - atest NetworkStackTests - atest ConnectivityServiceTest Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6 Merged-In: Ie1d02bb7bccb76415cf71824147466cabf6b88b6 Merged-In: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4 (cherry picked from commit 58a1f931eba8716c4a630863f658b070cda623de)
-rw-r--r--services/net/java/android/net/NattKeepalivePacketData.java (renamed from core/java/android/net/NattKeepalivePacketData.java)0
1 files changed, 0 insertions, 0 deletions
diff --git a/core/java/android/net/NattKeepalivePacketData.java b/services/net/java/android/net/NattKeepalivePacketData.java
index 5c55a98b874f..5c55a98b874f 100644
--- a/core/java/android/net/NattKeepalivePacketData.java
+++ b/services/net/java/android/net/NattKeepalivePacketData.java