diff --git a/Tethering/src/android/net/ip/DadProxy.java b/Tethering/src/android/net/ip/DadProxy.java index e2976b7890..36ecfe3ba0 100644 --- a/Tethering/src/android/net/ip/DadProxy.java +++ b/Tethering/src/android/net/ip/DadProxy.java @@ -16,11 +16,12 @@ package android.net.ip; -import android.net.util.InterfaceParams; import android.os.Handler; import androidx.annotation.VisibleForTesting; +import com.android.net.module.util.InterfaceParams; + /** * Basic Duplicate address detection proxy. * diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index 965c1a14d9..acd2625b19 100644 --- a/Tethering/src/android/net/ip/IpServer.java +++ b/Tethering/src/android/net/ip/IpServer.java @@ -46,7 +46,6 @@ import android.net.dhcp.IDhcpEventCallbacks; import android.net.dhcp.IDhcpServer; import android.net.ip.IpNeighborMonitor.NeighborEvent; import android.net.ip.RouterAdvertisementDaemon.RaParams; -import android.net.util.InterfaceParams; import android.net.util.SharedLog; import android.os.Handler; import android.os.Looper; @@ -63,6 +62,7 @@ import com.android.internal.util.MessageUtils; import com.android.internal.util.State; import com.android.internal.util.StateMachine; import com.android.modules.utils.build.SdkLevel; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.NetdUtils; import com.android.networkstack.tethering.BpfCoordinator; import com.android.networkstack.tethering.BpfCoordinator.ClientInfo; diff --git a/Tethering/src/android/net/ip/NeighborPacketForwarder.java b/Tethering/src/android/net/ip/NeighborPacketForwarder.java index 27e59a1681..723bd63543 100644 --- a/Tethering/src/android/net/ip/NeighborPacketForwarder.java +++ b/Tethering/src/android/net/ip/NeighborPacketForwarder.java @@ -24,13 +24,13 @@ import static android.system.OsConstants.SOCK_DGRAM; import static android.system.OsConstants.SOCK_NONBLOCK; import static android.system.OsConstants.SOCK_RAW; -import android.net.util.InterfaceParams; import android.net.util.SocketUtils; import android.os.Handler; import android.system.ErrnoException; import android.system.Os; import android.util.Log; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.PacketReader; import com.android.networkstack.tethering.util.TetheringUtils; diff --git a/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java b/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java index 74f936967d..c452e55d96 100644 --- a/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java +++ b/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java @@ -37,7 +37,6 @@ import android.net.IpPrefix; import android.net.LinkAddress; import android.net.MacAddress; import android.net.TrafficStats; -import android.net.util.InterfaceParams; import android.net.util.SocketUtils; import android.system.ErrnoException; import android.system.Os; @@ -45,6 +44,7 @@ import android.system.StructTimeval; import android.util.Log; import com.android.internal.annotations.GuardedBy; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.structs.Icmpv6Header; import com.android.net.module.util.structs.LlaOption; import com.android.net.module.util.structs.MtuOption; diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java index 6550de2ea7..64365ccc16 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java @@ -44,7 +44,6 @@ import android.net.ip.ConntrackMonitor; import android.net.ip.ConntrackMonitor.ConntrackEventConsumer; import android.net.ip.IpServer; import android.net.netstats.provider.NetworkStatsProvider; -import android.net.util.InterfaceParams; import android.net.util.SharedLog; import android.os.Handler; import android.os.SystemClock; @@ -64,6 +63,7 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.BpfMap; import com.android.net.module.util.CollectionUtils; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.NetworkStackConstants; import com.android.net.module.util.Struct; import com.android.net.module.util.bpf.Tether4Key; diff --git a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java index 77efb518f0..3d2dfaa8db 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java @@ -20,10 +20,9 @@ import static android.system.OsConstants.ETH_P_IPV6; import static com.android.networkstack.tethering.util.TetheringUtils.getTetheringJniLibraryName; -import android.net.util.InterfaceParams; - import androidx.annotation.NonNull; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.TcUtils; import java.io.IOException; diff --git a/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java b/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java index eb9cf711f7..ebf09ed199 100644 --- a/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java +++ b/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java @@ -30,7 +30,6 @@ import android.content.Context; import android.net.INetd; import android.net.InetAddresses; import android.net.MacAddress; -import android.net.util.InterfaceParams; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -40,6 +39,7 @@ import android.os.Looper; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; +import com.android.net.module.util.InterfaceParams; import com.android.networkstack.tethering.util.TetheringUtils; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRunner; diff --git a/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java b/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java index 34f3e0edaa..328e3fb61c 100644 --- a/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java +++ b/Tethering/tests/privileged/src/android/net/ip/RouterAdvertisementDaemonTest.java @@ -44,7 +44,6 @@ import android.net.IpPrefix; import android.net.MacAddress; import android.net.RouteInfo; import android.net.ip.RouterAdvertisementDaemon.RaParams; -import android.net.util.InterfaceParams; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -54,6 +53,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.Ipv6Utils; import com.android.net.module.util.NetdUtils; import com.android.net.module.util.Struct; diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index 41bbc4cf33..6488421464 100644 --- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java @@ -86,7 +86,6 @@ import android.net.dhcp.IDhcpServerCallbacks; import android.net.ip.IpNeighborMonitor.NeighborEvent; import android.net.ip.IpNeighborMonitor.NeighborEventConsumer; import android.net.ip.RouterAdvertisementDaemon.RaParams; -import android.net.util.InterfaceParams; import android.net.util.SharedLog; import android.os.Build; import android.os.Handler; @@ -100,6 +99,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.net.module.util.BpfMap; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.NetworkStackConstants; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java index 6c7a66dc47..c614046c6c 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java @@ -84,7 +84,6 @@ import android.net.TetherStatsParcel; import android.net.ip.ConntrackMonitor; import android.net.ip.ConntrackMonitor.ConntrackEventConsumer; import android.net.ip.IpServer; -import android.net.util.InterfaceParams; import android.net.util.SharedLog; import android.os.Build; import android.os.Handler; @@ -98,6 +97,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.dx.mockito.inline.extended.ExtendedMockito; import com.android.net.module.util.BpfMap; import com.android.net.module.util.CollectionUtils; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.NetworkStackConstants; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java index e4dbc7d83a..ae5d38987a 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java @@ -152,7 +152,6 @@ import android.net.ip.DadProxy; import android.net.ip.IpNeighborMonitor; import android.net.ip.IpServer; import android.net.ip.RouterAdvertisementDaemon; -import android.net.util.InterfaceParams; import android.net.util.NetworkConstants; import android.net.util.SharedLog; import android.net.wifi.SoftApConfiguration; @@ -185,6 +184,7 @@ import com.android.internal.util.StateMachine; import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.internal.util.test.FakeSettingsProvider; import com.android.net.module.util.CollectionUtils; +import com.android.net.module.util.InterfaceParams; import com.android.networkstack.apishim.common.BluetoothPanShim; import com.android.networkstack.apishim.common.BluetoothPanShim.TetheredInterfaceCallbackShim; import com.android.networkstack.apishim.common.BluetoothPanShim.TetheredInterfaceRequestShim; diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 65ed8a3050..06a4cef398 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -92,7 +92,6 @@ rule android.net.shared.** com.android.connectivity.@0 rule android.net.util.KeepalivePacketDataUtil* com.android.connectivity.@0 # From connectivity-module-utils -rule android.net.util.InterfaceParams* com.android.connectivity.@0 rule android.net.util.SharedLog* com.android.connectivity.@0 rule android.net.shared.** com.android.connectivity.@0 diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index eabcd10c25..ab78104a51 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -198,7 +198,6 @@ import android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener; import android.net.resolv.aidl.Nat64PrefixEventParcel; import android.net.resolv.aidl.PrivateDnsValidationEventParcel; import android.net.shared.PrivateDnsConfig; -import android.net.util.InterfaceParams; import android.net.util.MultinetworkPolicyTracker; import android.os.BatteryStatsManager; import android.os.Binder; @@ -245,6 +244,7 @@ import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.BaseNetdUnsolicitedEventListener; import com.android.net.module.util.CollectionUtils; import com.android.net.module.util.DeviceConfigUtils; +import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult; import com.android.net.module.util.LinkPropertiesUtils.CompareResult; import com.android.net.module.util.LocationPermissionChecker;