From 69aee7b05512ecde5f5fb891a4a595e15d3d343e Mon Sep 17 00:00:00 2001 From: Handa Wang Date: Fri, 16 Aug 2024 08:56:41 +0000 Subject: [PATCH] Move PrivateAddressCoordinator from Tethering to staticlibs This CL moves PrivateAddressCoordinator from Tethering to staticlibs so that RoutingCooridnatorService can create an instance of PrivateAddressCoordinator. Bug: 350699020 Change-Id: I13ccd515972243719465c1c9ab844f802bc8884b --- .../android/networkstack/tethering/TetheringDependencies.java | 1 + Tethering/tests/unit/src/android/net/ip/IpServerTest.java | 4 +--- .../networkstack/tethering/PrivateAddressCoordinatorTest.java | 2 ++ .../src/com/android/networkstack/tethering/TetheringTest.java | 1 + staticlibs/Android.bp | 1 + .../android/net/module/util}/PrivateAddressCoordinator.java | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) rename {Tethering/src/com/android/networkstack/tethering => staticlibs/device/com/android/net/module/util}/PrivateAddressCoordinator.java (99%) diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java b/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java index 34f28977f8..a4823caac0 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringDependencies.java @@ -36,6 +36,7 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import com.android.modules.utils.build.SdkLevel; +import com.android.net.module.util.PrivateAddressCoordinator; import com.android.net.module.util.RoutingCoordinatorManager; import com.android.net.module.util.RoutingCoordinatorService; import com.android.net.module.util.SharedLog; diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index f7834a3a99..9603e548a9 100644 --- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java @@ -89,13 +89,11 @@ import android.text.TextUtils; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; -import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.RoutingCoordinatorManager; -import com.android.net.module.util.SdkUtil.LateSdk; import com.android.net.module.util.SharedLog; import com.android.networkstack.tethering.BpfCoordinator; -import com.android.networkstack.tethering.PrivateAddressCoordinator; +import com.android.net.module.util.PrivateAddressCoordinator; import com.android.networkstack.tethering.TetheringConfiguration; import com.android.networkstack.tethering.metrics.TetheringMetrics; import com.android.networkstack.tethering.util.InterfaceSet; diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java index bff1fdaec3..659ab6036a 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java @@ -51,6 +51,8 @@ import android.net.ip.IpServer; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.net.module.util.PrivateAddressCoordinator; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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 66fe9571a5..9481890aa5 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java @@ -192,6 +192,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.PrivateAddressCoordinator; import com.android.net.module.util.RoutingCoordinatorManager; import com.android.net.module.util.SharedLog; import com.android.net.module.util.ip.IpNeighborMonitor; diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 85258f8ff1..372940494f 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -649,6 +649,7 @@ filegroup { name: "net-utils-all-srcs", srcs: [ "device/**/*.java", + ":framework-connectivity-shared-srcs", ":net-utils-framework-common-srcs", ], visibility: ["//visibility:private"], diff --git a/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java b/staticlibs/device/com/android/net/module/util/PrivateAddressCoordinator.java similarity index 99% rename from Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java rename to staticlibs/device/com/android/net/module/util/PrivateAddressCoordinator.java index db97986036..990358d39e 100644 --- a/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java +++ b/staticlibs/device/com/android/net/module/util/PrivateAddressCoordinator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.networkstack.tethering; +package com.android.net.module.util; import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.TetheringManager.CONNECTIVITY_SCOPE_GLOBAL;