diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-03-18 23:50:34 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2019-03-20 08:56:24 +0900 |
| commit | e40a2bb76de3c693c0eb13657e950a8263c35a4a (patch) | |
| tree | ce71cdd84ebdc6b9f599b4f72fa6c8bd20a533a7 | |
| parent | 5b6787641347ef2122afcc39487ca7765dfb3f18 (diff) | |
Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.
These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).
Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.
This does not actually remove the dependency from the build file,
that will be done in a future CL.
Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Merged-In: I027d50ba56091f5558f45e6e08f32e5912b2a82a
| -rw-r--r-- | jarjar-rules-shared.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt index a8c712a..c2058ca 100644 --- a/jarjar-rules-shared.txt +++ b/jarjar-rules-shared.txt @@ -9,11 +9,5 @@ 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 +rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1 |