Move TcpKeepalivePacketData out of the framework. am: a3f811a547 (aa597216) · Commits · e / os / android_frameworks_base

packages/NetworkStack/jarjar-rules-shared.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

+4 −3

Original line number	Diff line number	Diff line
		@@ -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<TcpKeepalivePacketData> CREATOR =
		public static final @NonNull Parcelable.Creator<TcpKeepalivePacketData> CREATOR =
		new Parcelable.Creator<TcpKeepalivePacketData>() {
		public TcpKeepalivePacketData createFromParcel(Parcel in) {
		return new TcpKeepalivePacketData(in);