From 8cf997d1c141e3387c67654254d5fcab02b0f2b1 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Tue, 23 Apr 2019 22:48:59 -0700 Subject: [PATCH] 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) --- .../net}/java/android/net/NattKeepalivePacketData.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {core => services/net}/java/android/net/NattKeepalivePacketData.java (100%) diff --git a/core/java/android/net/NattKeepalivePacketData.java b/services/net/java/android/net/NattKeepalivePacketData.java similarity index 100% rename from core/java/android/net/NattKeepalivePacketData.java rename to services/net/java/android/net/NattKeepalivePacketData.java