From a3f811a547813d462b49288175eb1774bf354146 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 19 Mar 2019 00:24:19 +0900 Subject: [PATCH] Move TcpKeepalivePacketData out of the framework. This class is not used in framework.jar, only in services.jar. Move it out of the framework so framework.jar can stop depending on the NetworkStack stable AIDL interfaces. This should really under com.android.server as well, but that's a cross-project change to be done in another CL. Test: m Bug: 128804404 Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703 Merged-In: Ib2805f7fcc516a5f6989c252365d1c95b8042703 --- packages/NetworkStack/jarjar-rules-shared.txt | 3 --- .../net}/java/android/net/TcpKeepalivePacketData.java | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) rename {core => services/net}/java/android/net/TcpKeepalivePacketData.java (97%) diff --git a/packages/NetworkStack/jarjar-rules-shared.txt b/packages/NetworkStack/jarjar-rules-shared.txt index c2058ca5ecdfe..7346b1ae81e69 100644 --- a/packages/NetworkStack/jarjar-rules-shared.txt +++ b/packages/NetworkStack/jarjar-rules-shared.txt @@ -8,6 +8,3 @@ rule android.net.shared.InetAddressUtils* android.net.networkstack.shared.InetAd rule android.net.DhcpResultsParcelable* @0 rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1 rule android.net.LocalLog* android.net.networkstack.LocalLog@1 - -# TODO: move TcpKeepalivePacketData to services.net and delete -rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1 diff --git a/core/java/android/net/TcpKeepalivePacketData.java b/services/net/java/android/net/TcpKeepalivePacketData.java similarity index 97% rename from core/java/android/net/TcpKeepalivePacketData.java rename to services/net/java/android/net/TcpKeepalivePacketData.java index f07dfb64cd01a..398a6b31cbce3 100644 --- a/core/java/android/net/TcpKeepalivePacketData.java +++ b/services/net/java/android/net/TcpKeepalivePacketData.java @@ -167,8 +167,9 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce tcpWndScale); } - /* Parcelable Implementation. */ - /* Note that this object implements parcelable (and needs to keep doing this as it inherits + /** + * Parcelable Implementation. + * Note that this object implements parcelable (and needs to keep doing this as it inherits * from a class that does), but should usually be parceled as a stable parcelable using * the toStableParcelable() and fromStableParcelable() methods. */ @@ -194,7 +195,7 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce } /** Parcelable Creator. */ - public static final Parcelable.Creator CREATOR = + public static final @NonNull Parcelable.Creator CREATOR = new Parcelable.Creator() { public TcpKeepalivePacketData createFromParcel(Parcel in) { return new TcpKeepalivePacketData(in);