Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move TcpKeepalivePacketData out of the framework.

Browse Source 
am: a3f811a547

Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d
This commit is contained in:
Lorenzo Colitti
2019-03-20 03:11:11 -07:00
committed by android-build-merger
parent faa074ebbe a3f811a547
commit bc1d9ded1a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/NetworkStack/jarjar-rules-shared.txt
View File

@@ -8,6 +8,3 @@ rule android.net.shared.InetAddressUtils* android.net.networkstack.shared.InetAd
rule android.net.DhcpResultsParcelable* @0 rule android.net.DhcpResultsParcelable* @0
rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1 rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1
rule android.net.LocalLog* android.net.networkstack.LocalLog@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

7
core/java/android/net/TcpKeepalivePacketData.java → services/net/java/android/net/TcpKeepalivePacketData.java
View File

@@ -167,8 +167,9 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce
tcpWndScale); 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 * from a class that does), but should usually be parceled as a stable parcelable using
* the toStableParcelable() and fromStableParcelable() methods. * the toStableParcelable() and fromStableParcelable() methods.
*/ */
@@ -194,7 +195,7 @@ public class TcpKeepalivePacketData extends KeepalivePacketData implements Parce
} }
/** Parcelable Creator. */ /** Parcelable Creator. */
public static final Parcelable.Creator<TcpKeepalivePacketData> CREATOR = public static final @NonNull Parcelable.Creator<TcpKeepalivePacketData> CREATOR =
new Parcelable.Creator<TcpKeepalivePacketData>() { new Parcelable.Creator<TcpKeepalivePacketData>() {
public TcpKeepalivePacketData createFromParcel(Parcel in) { public TcpKeepalivePacketData createFromParcel(Parcel in) {
return new TcpKeepalivePacketData(in); return new TcpKeepalivePacketData(in);