diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index eb2674e20d..1236243fdd 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -205,7 +205,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.MultinetworkPolicyTracker; import android.net.wifi.WifiInfo; import android.os.BatteryStatsManager; import android.os.Binder; @@ -272,6 +271,7 @@ import com.android.server.connectivity.FullScore; import com.android.server.connectivity.KeepaliveTracker; import com.android.server.connectivity.LingerMonitor; import com.android.server.connectivity.MockableSystemProperties; +import com.android.server.connectivity.MultinetworkPolicyTracker; import com.android.server.connectivity.NetworkAgentInfo; import com.android.server.connectivity.NetworkDiagnostics; import com.android.server.connectivity.NetworkNotificationManager; diff --git a/framework/src/android/net/util/MultinetworkPolicyTracker.java b/service/src/com/android/server/connectivity/MultinetworkPolicyTracker.java similarity index 99% rename from framework/src/android/net/util/MultinetworkPolicyTracker.java rename to service/src/com/android/server/connectivity/MultinetworkPolicyTracker.java index c50df4aa1e..f1cb9f123f 100644 --- a/framework/src/android/net/util/MultinetworkPolicyTracker.java +++ b/service/src/com/android/server/connectivity/MultinetworkPolicyTracker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util; +package com.android.server.connectivity; import static android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI; import static android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE; diff --git a/service/src/com/android/server/connectivity/NetworkRanker.java b/service/src/com/android/server/connectivity/NetworkRanker.java index 735505a86b..d94c8dceeb 100644 --- a/service/src/com/android/server/connectivity/NetworkRanker.java +++ b/service/src/com/android/server/connectivity/NetworkRanker.java @@ -40,7 +40,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.util.MultinetworkPolicyTracker; import com.android.internal.annotations.VisibleForTesting; import com.android.net.module.util.CollectionUtils; diff --git a/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt b/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt index 73e4c0ebd9..5b3f37dc82 100644 --- a/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt +++ b/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt @@ -37,7 +37,7 @@ import android.net.NetworkRequest import android.net.TestNetworkStackClient import android.net.Uri import android.net.metrics.IpConnectivityLog -import android.net.util.MultinetworkPolicyTracker +import com.android.server.connectivity.MultinetworkPolicyTracker import android.os.ConditionVariable import android.os.IBinder import android.os.SystemConfigManager diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 32191a54c8..31b0908e49 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -303,7 +303,6 @@ import android.net.networkstack.NetworkStackClientBase; import android.net.resolv.aidl.Nat64PrefixEventParcel; import android.net.resolv.aidl.PrivateDnsValidationEventParcel; import android.net.shared.PrivateDnsConfig; -import android.net.util.MultinetworkPolicyTracker; import android.net.wifi.WifiInfo; import android.os.BadParcelableException; import android.os.BatteryStatsManager; @@ -366,6 +365,7 @@ import com.android.server.ConnectivityServiceTest.ConnectivityServiceDependencie import com.android.server.connectivity.CarrierPrivilegeAuthenticator; import com.android.server.connectivity.ClatCoordinator; import com.android.server.connectivity.ConnectivityFlags; +import com.android.server.connectivity.MultinetworkPolicyTracker; import com.android.server.connectivity.Nat464Xlat; import com.android.server.connectivity.NetworkAgentInfo; import com.android.server.connectivity.NetworkNotificationManager; diff --git a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt b/tests/unit/java/com/android/server/connectivity/MultinetworkPolicyTrackerTest.kt similarity index 97% rename from tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt rename to tests/unit/java/com/android/server/connectivity/MultinetworkPolicyTrackerTest.kt index f3178639ae..c4ce04194d 100644 --- a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt +++ b/tests/unit/java/com/android/server/connectivity/MultinetworkPolicyTrackerTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util +package com.android.server.connectivity import android.content.Context import android.content.res.Resources @@ -24,7 +24,7 @@ import android.net.ConnectivityManager.MULTIPATH_PREFERENCE_RELIABILITY import android.net.ConnectivityResources import android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI import android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE -import android.net.util.MultinetworkPolicyTracker.ActiveDataSubscriptionIdListener +import com.android.server.connectivity.MultinetworkPolicyTracker.ActiveDataSubscriptionIdListener import android.os.Build import android.os.Handler import android.provider.Settings @@ -60,7 +60,7 @@ import org.mockito.Mockito.verify * Tests for [MultinetworkPolicyTracker]. * * Build, install and run with: - * atest android.net.util.MultinetworkPolicyTrackerTest + * atest FrameworksNetTest:MultinetworkPolicyTrackerTest */ @RunWith(DevSdkIgnoreRunner::class) @SmallTest