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

Commit d8face3d authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes from topic "framework-no-networkstack-aidl" 

* changes:
  Remove the framework dependency on netd_aidl_parcelables-java.
  Move TcpKeepalivePacketData out of the framework.
  Stop using netd parcelables in the framework.
parents 6bc1865f 0568e686

jarjar-rules-shared.txt

+0 −9
Original line number Original line Diff line number Diff line
@@ -8,12 +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: remove from framework dependencies, then remove here

rule android.net.InterfaceConfigurationParcel* android.net.networkstack.InterfaceConfigurationParcel@1

rule android.net.TetherStatsParcel* android.net.networkstack.TetherStatsParcel@1



# Used by UidRange, which is used by framework classes such as NetworkCapabilities.

rule android.net.UidRangeParcel* android.net.networkstack.UidRangeParcel@1

# TODO: move TcpKeepalivePacketData to services.net and delete

rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1
 
 No newline at end of file