diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-03-20 09:45:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-20 09:45:37 +0000 |
| commit | d8face3d1c9760fbf8deb8adf20a868b440819df (patch) | |
| tree | 4682de20f4467c134b709fc551fefc4683e7b237 | |
| parent | 6bc1865fc5d0affd6b1b478c2914336eb797a5d5 (diff) | |
| parent | 0568e686d3190c60a6793ce31c6957d0cb59a188 (diff) | |
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.
| -rw-r--r-- | jarjar-rules-shared.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt index a8c712a..7346b1a 100644 --- a/jarjar-rules-shared.txt +++ b/jarjar-rules-shared.txt @@ -8,12 +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: 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 |