Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e59c57 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

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
parent cc7f1db9

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

core/java/android/net/TcpKeepalivePacketData.java→services/net/java/android/net/TcpKeepalivePacketData.java

+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 @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);