From b873e25ab48f0f757c207b194de1ac940ed82320 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 16 Jun 2022 16:38:43 -0700 Subject: [PATCH] Use frameworks/libs/net version of SharedLog Test: m Bug: 235901424 Change-Id: Ibfa7821c68c41036a47e765f15078cd5d195afb8 --- .../tethering/apishim/api30/BpfCoordinatorShimImpl.java | 2 +- .../tethering/apishim/api31/BpfCoordinatorShimImpl.java | 2 +- Tethering/src/android/net/ip/IpServer.java | 2 +- .../com/android/networkstack/tethering/BpfCoordinator.java | 2 +- .../android/networkstack/tethering/EntitlementManager.java | 2 +- .../networkstack/tethering/IPv6TetheringCoordinator.java | 3 ++- .../android/networkstack/tethering/OffloadController.java | 2 +- .../networkstack/tethering/OffloadHardwareInterface.java | 2 +- .../src/com/android/networkstack/tethering/Tethering.java | 2 +- .../networkstack/tethering/TetheringConfiguration.java | 2 +- .../networkstack/tethering/TetheringDependencies.java | 2 +- .../networkstack/tethering/UpstreamNetworkMonitor.java | 2 +- .../android/networkstack/tethering/ConntrackSocketTest.java | 2 +- Tethering/tests/unit/src/android/net/ip/IpServerTest.java | 2 +- .../android/networkstack/tethering/BpfCoordinatorTest.java | 2 +- .../networkstack/tethering/EntitlementManagerTest.java | 2 +- .../networkstack/tethering/FakeTetheringConfiguration.java | 3 ++- .../networkstack/tethering/IPv6TetheringCoordinatorTest.java | 3 ++- .../networkstack/tethering/OffloadControllerTest.java | 2 +- .../networkstack/tethering/OffloadHardwareInterfaceTest.java | 2 +- .../networkstack/tethering/TetheringConfigurationTest.java | 2 +- .../com/android/networkstack/tethering/TetheringTest.java | 2 +- .../networkstack/tethering/UpstreamNetworkMonitorTest.java | 2 +- service/jarjar-rules.txt | 1 - .../android/server/connectivity/mdns/util/MdnsLogger.java | 5 +++-- .../com/android/server/connectivity/PermissionMonitor.java | 2 +- .../server/net/integrationtests/TestNetworkStackService.kt | 2 +- 27 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java b/Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java index b865a8edd9..18ef63171d 100644 --- a/Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java +++ b/Tethering/apishim/30/com/android/networkstack/tethering/apishim/api30/BpfCoordinatorShimImpl.java @@ -19,7 +19,6 @@ package com.android.networkstack.tethering.apishim.api30; import android.net.INetd; import android.net.MacAddress; import android.net.TetherStatsParcel; -import android.net.util.SharedLog; import android.os.RemoteException; import android.os.ServiceSpecificException; import android.util.SparseArray; @@ -28,6 +27,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.net.module.util.IBpfMap.ThrowingBiConsumer; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; import com.android.net.module.util.bpf.TetherStatsValue; diff --git a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java index 0683e5ec68..fd9dab5ddf 100644 --- a/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java +++ b/Tethering/apishim/31/com/android/networkstack/tethering/apishim/api31/BpfCoordinatorShimImpl.java @@ -19,7 +19,6 @@ package com.android.networkstack.tethering.apishim.api31; import static android.net.netstats.provider.NetworkStatsProvider.QUOTA_UNLIMITED; import android.net.MacAddress; -import android.net.util.SharedLog; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; @@ -31,6 +30,7 @@ import androidx.annotation.Nullable; import com.android.net.module.util.BpfMap; import com.android.net.module.util.IBpfMap.ThrowingBiConsumer; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; import com.android.net.module.util.bpf.TetherStatsKey; diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index 437ed71c21..da7ca56463 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.SharedLog; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -64,6 +63,7 @@ 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.net.module.util.SharedLog; import com.android.networkstack.tethering.BpfCoordinator; import com.android.networkstack.tethering.BpfCoordinator.ClientInfo; import com.android.networkstack.tethering.BpfCoordinator.Ipv6ForwardingRule; diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java index ca4071f51c..133ae01ea7 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.SharedLog; import android.os.Handler; import android.os.SystemClock; import android.system.ErrnoException; @@ -65,6 +64,7 @@ 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.SharedLog; import com.android.net.module.util.Struct; import com.android.net.module.util.Struct.U32; import com.android.net.module.util.bpf.Tether4Key; diff --git a/Tethering/src/com/android/networkstack/tethering/EntitlementManager.java b/Tethering/src/com/android/networkstack/tethering/EntitlementManager.java index adc95abea4..741af5c070 100644 --- a/Tethering/src/com/android/networkstack/tethering/EntitlementManager.java +++ b/Tethering/src/com/android/networkstack/tethering/EntitlementManager.java @@ -43,7 +43,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.net.util.SharedLog; import android.os.Bundle; import android.os.Handler; import android.os.Parcel; @@ -55,6 +54,7 @@ import android.util.SparseIntArray; import com.android.internal.annotations.VisibleForTesting; import com.android.modules.utils.build.SdkLevel; +import com.android.net.module.util.SharedLog; import java.io.PrintWriter; import java.util.BitSet; diff --git a/Tethering/src/com/android/networkstack/tethering/IPv6TetheringCoordinator.java b/Tethering/src/com/android/networkstack/tethering/IPv6TetheringCoordinator.java index f3dcaa2529..ab3929ddcb 100644 --- a/Tethering/src/com/android/networkstack/tethering/IPv6TetheringCoordinator.java +++ b/Tethering/src/com/android/networkstack/tethering/IPv6TetheringCoordinator.java @@ -24,9 +24,10 @@ import android.net.NetworkCapabilities; import android.net.RouteInfo; import android.net.ip.IpServer; import android.net.util.NetworkConstants; -import android.net.util.SharedLog; import android.util.Log; +import com.android.net.module.util.SharedLog; + import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/Tethering/src/com/android/networkstack/tethering/OffloadController.java b/Tethering/src/com/android/networkstack/tethering/OffloadController.java index d60c21d823..94684af040 100644 --- a/Tethering/src/com/android/networkstack/tethering/OffloadController.java +++ b/Tethering/src/com/android/networkstack/tethering/OffloadController.java @@ -43,7 +43,6 @@ import android.net.NetworkStats; import android.net.NetworkStats.Entry; import android.net.RouteInfo; import android.net.netstats.provider.NetworkStatsProvider; -import android.net.util.SharedLog; import android.os.Handler; import android.provider.Settings; import android.system.ErrnoException; @@ -53,6 +52,7 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IndentingPrintWriter; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.netlink.ConntrackMessage; import com.android.net.module.util.netlink.NetlinkConstants; import com.android.net.module.util.netlink.NetlinkSocket; diff --git a/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java b/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java index 9da66d8119..fbb342dd48 100644 --- a/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java +++ b/Tethering/src/com/android/networkstack/tethering/OffloadHardwareInterface.java @@ -28,7 +28,6 @@ import android.hardware.tetheroffload.control.V1_0.NatTimeoutUpdate; import android.hardware.tetheroffload.control.V1_0.NetworkProtocol; import android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent; import android.hardware.tetheroffload.control.V1_1.ITetheringOffloadCallback; -import android.net.util.SharedLog; import android.net.util.SocketUtils; import android.os.Handler; import android.os.NativeHandle; @@ -40,6 +39,7 @@ import android.util.Log; import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.netlink.NetlinkSocket; import com.android.net.module.util.netlink.StructNfGenMsg; import com.android.net.module.util.netlink.StructNlMsgHdr; diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java index f613b73676..47b1bd751d 100644 --- a/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java @@ -99,7 +99,6 @@ import android.net.TetheringManager.TetheringRequest; import android.net.TetheringRequestParcel; import android.net.ip.IpServer; import android.net.shared.NetdUtils; -import android.net.util.SharedLog; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pGroup; @@ -136,6 +135,7 @@ import com.android.internal.util.StateMachine; 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.SharedLog; 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/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java index 7c360547d7..696a970aec 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java @@ -30,7 +30,6 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.net.TetheringConfigurationParcel; -import android.net.util.SharedLog; import android.os.PersistableBundle; import android.provider.DeviceConfig; import android.provider.Settings; @@ -42,6 +41,7 @@ import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.DeviceConfigUtils; +import com.android.net.module.util.SharedLog; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java b/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java index 8e0354d082..611d1cff00 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java @@ -22,7 +22,6 @@ import android.bluetooth.BluetoothPan; import android.content.Context; import android.net.INetd; import android.net.ip.IpServer; -import android.net.util.SharedLog; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -32,6 +31,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.android.internal.util.StateMachine; +import com.android.net.module.util.SharedLog; import com.android.networkstack.apishim.BluetoothPanShimImpl; import com.android.networkstack.apishim.common.BluetoothPanShim; import com.android.networkstack.tethering.metrics.TetheringMetrics; diff --git a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java index f8dd673a21..16c031bb18 100644 --- a/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java +++ b/Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java @@ -36,7 +36,6 @@ import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.util.SharedLog; import android.os.Handler; import android.util.Log; import android.util.SparseIntArray; @@ -46,6 +45,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.StateMachine; +import com.android.net.module.util.SharedLog; import com.android.networkstack.apishim.ConnectivityManagerShimImpl; import com.android.networkstack.apishim.common.ConnectivityManagerShim; import com.android.networkstack.tethering.util.PrefixUtils; diff --git a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java index 7ee69b27e1..d38a7c3206 100644 --- a/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java +++ b/Tethering/tests/privileged/src/com/android/networkstack/tethering/ConntrackSocketTest.java @@ -28,7 +28,6 @@ import static com.android.networkstack.tethering.OffloadHardwareInterface.NF_NET import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import android.net.util.SharedLog; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -38,6 +37,7 @@ import android.system.Os; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.netlink.StructNlMsgHdr; import org.junit.Before; diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index bf7e887986..ef143de02c 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.SharedLog; import android.os.Build; import android.os.Handler; import android.os.RemoteException; @@ -101,6 +100,7 @@ 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.SharedLog; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; import com.android.net.module.util.bpf.TetherStatsKey; 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 3630f2478f..20a222dd46 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java @@ -85,7 +85,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.SharedLog; import android.os.Build; import android.os.Handler; import android.os.test.TestLooper; @@ -100,6 +99,7 @@ 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.SharedLog; import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Value; import com.android.net.module.util.bpf.TetherStatsKey; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java index 01d7b4b568..e4263db9c6 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java @@ -65,7 +65,6 @@ import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.net.util.SharedLog; import android.os.Bundle; import android.os.Handler; import android.os.PersistableBundle; @@ -82,6 +81,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.modules.utils.build.SdkLevel; +import com.android.net.module.util.SharedLog; import com.android.testutils.DevSdkIgnoreRule; import org.junit.After; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/FakeTetheringConfiguration.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/FakeTetheringConfiguration.java index ac5c59d9ba..95ec38f563 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/FakeTetheringConfiguration.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/FakeTetheringConfiguration.java @@ -18,7 +18,8 @@ package com.android.networkstack.tethering; import android.content.Context; import android.content.res.Resources; -import android.net.util.SharedLog; + +import com.android.net.module.util.SharedLog; /** FakeTetheringConfiguration is used to override static method for testing. */ public class FakeTetheringConfiguration extends TetheringConfiguration { diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/IPv6TetheringCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/IPv6TetheringCoordinatorTest.java index f2b5314e5a..865228af76 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/IPv6TetheringCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/IPv6TetheringCoordinatorTest.java @@ -41,11 +41,12 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.RouteInfo; import android.net.ip.IpServer; -import android.net.util.SharedLog; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.net.module.util.SharedLog; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java index 8ef0c76aa3..faca1c890f 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java @@ -67,7 +67,6 @@ import android.net.NetworkStats; import android.net.NetworkStats.Entry; import android.net.RouteInfo; import android.net.netstats.provider.NetworkStatsProvider; -import android.net.util.SharedLog; import android.os.Build; import android.os.Handler; import android.os.test.TestLooper; @@ -79,6 +78,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.test.FakeSettingsProvider; +import com.android.net.module.util.SharedLog; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.TestableNetworkStatsProviderCbBinder; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadHardwareInterfaceTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadHardwareInterfaceTest.java index d1891edec9..36b439b661 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadHardwareInterfaceTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadHardwareInterfaceTest.java @@ -43,7 +43,6 @@ import android.hardware.tetheroffload.control.V1_0.NatTimeoutUpdate; import android.hardware.tetheroffload.control.V1_0.NetworkProtocol; import android.hardware.tetheroffload.control.V1_1.ITetheringOffloadCallback; import android.hardware.tetheroffload.control.V1_1.OffloadCallbackEvent; -import android.net.util.SharedLog; import android.os.Handler; import android.os.NativeHandle; import android.os.test.TestLooper; @@ -55,6 +54,7 @@ import android.util.Pair; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.net.module.util.SharedLog; import com.android.net.module.util.netlink.StructNfGenMsg; import com.android.net.module.util.netlink.StructNlMsgHdr; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java index 3190f356f4..1a12125531 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java @@ -47,7 +47,6 @@ import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.net.util.SharedLog; import android.os.Build; import android.os.PersistableBundle; import android.provider.DeviceConfig; @@ -63,6 +62,7 @@ import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.internal.util.test.FakeSettingsProvider; import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.DeviceConfigUtils; +import com.android.net.module.util.SharedLog; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; 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 773cae3424..cc80174dcf 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java @@ -156,7 +156,6 @@ import android.net.ip.IpNeighborMonitor; import android.net.ip.IpServer; import android.net.ip.RouterAdvertisementDaemon; import android.net.util.NetworkConstants; -import android.net.util.SharedLog; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; @@ -189,6 +188,7 @@ 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.net.module.util.SharedLog; 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/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java index 97cebd8477..9b9507b381 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/UpstreamNetworkMonitorTest.java @@ -49,7 +49,6 @@ import android.net.LinkAddress; import android.net.LinkProperties; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.util.SharedLog; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -60,6 +59,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import com.android.net.module.util.SharedLog; import com.android.networkstack.tethering.TestConnectivityManager.NetworkRequestInfo; import com.android.networkstack.tethering.TestConnectivityManager.TestNetworkAgent; diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 4013d2eca7..1ad75e373b 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.SharedLog* com.android.connectivity.@0 rule android.net.shared.** com.android.connectivity.@0 # From services-connectivity-shared-srcs diff --git a/service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java b/service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java index 31c62f59ea..431f1fd528 100644 --- a/service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java +++ b/service/mdns/com/android/server/connectivity/mdns/util/MdnsLogger.java @@ -16,9 +16,10 @@ package com.android.server.connectivity.mdns.util; -import android.net.util.SharedLog; import android.text.TextUtils; +import com.android.net.module.util.SharedLog; + /** * The logger used in mDNS. */ @@ -58,4 +59,4 @@ public class MdnsLogger { public void w(String message) { mLog.w(message); } -} \ No newline at end of file +} diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java index 34c6d2d379..fd1ed608de 100755 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java @@ -51,7 +51,6 @@ import android.net.ConnectivitySettingsManager; import android.net.INetd; import android.net.UidRange; import android.net.Uri; -import android.net.util.SharedLog; import android.os.Build; import android.os.Process; import android.os.RemoteException; @@ -70,6 +69,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IndentingPrintWriter; import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.CollectionUtils; +import com.android.net.module.util.SharedLog; import com.android.networkstack.apishim.ProcessShimImpl; import com.android.networkstack.apishim.common.ProcessShim; import com.android.server.BpfNetMaps; diff --git a/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt b/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt index c7cf040bc7..361c968f97 100644 --- a/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt +++ b/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt @@ -22,8 +22,8 @@ import android.content.Intent import android.net.INetworkMonitorCallbacks import android.net.Network import android.net.metrics.IpConnectivityLog -import android.net.util.SharedLog import android.os.IBinder +import com.android.net.module.util.SharedLog import com.android.networkstack.netlink.TcpSocketTracker import com.android.server.NetworkStackService import com.android.server.NetworkStackService.NetworkMonitorConnector