diff options
| -rw-r--r-- | packages/NetworkStack/jarjar-rules-shared.txt | 3 | ||||
| -rw-r--r-- | services/net/java/android/net/TcpKeepalivePacketData.java (renamed from core/java/android/net/TcpKeepalivePacketData.java) | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/packages/NetworkStack/jarjar-rules-shared.txt b/packages/NetworkStack/jarjar-rules-shared.txt index c2058ca5ecdf..7346b1ae81e6 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 index 99d36c504e5c..398a6b31cbce 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 @android.annotation.NonNull 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); |