diff --git a/Vcn/framework-b/src/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java b/Vcn/framework-b/src/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java index c0398ce1fc..ded94159a9 100644 --- a/Vcn/framework-b/src/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java +++ b/Vcn/framework-b/src/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java @@ -23,18 +23,19 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS; import static android.net.NetworkCapabilities.NET_CAPABILITY_RCS; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY; import static android.net.vcn.VcnUnderlyingNetworkTemplate.getMatchCriteriaString; +import static android.net.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER; +import static android.net.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER; +import static android.net.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER; +import static android.net.vcn.util.PersistableBundleUtils.STRING_SERIALIZER; import static com.android.internal.annotations.VisibleForTesting.Visibility; -import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER; -import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER; -import static com.android.server.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER; -import static com.android.server.vcn.util.PersistableBundleUtils.STRING_SERIALIZER; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.net.NetworkCapabilities; import android.net.vcn.VcnUnderlyingNetworkTemplate.MatchCriteria; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -44,7 +45,6 @@ import android.util.IndentingPrintWriter; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; -import com.android.server.vcn.util.PersistableBundleUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/Vcn/framework-b/src/android/net/vcn/VcnConfig.java b/Vcn/framework-b/src/android/net/vcn/VcnConfig.java index a27e9230d4..0d0efb2f73 100644 --- a/Vcn/framework-b/src/android/net/vcn/VcnConfig.java +++ b/Vcn/framework-b/src/android/net/vcn/VcnConfig.java @@ -18,10 +18,10 @@ package android.net.vcn; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_TEST; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; +import static android.net.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER; +import static android.net.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER; import static com.android.internal.annotations.VisibleForTesting.Visibility; -import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_DESERIALIZER; -import static com.android.server.vcn.util.PersistableBundleUtils.INTEGER_SERIALIZER; import android.annotation.IntDef; import android.annotation.NonNull; @@ -29,6 +29,7 @@ import android.annotation.Nullable; import android.content.Context; import android.net.NetworkCapabilities; import android.net.NetworkRequest; +import android.net.vcn.util.PersistableBundleUtils; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; @@ -37,7 +38,6 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; -import com.android.server.vcn.util.PersistableBundleUtils; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Vcn/framework-b/src/android/net/vcn/VcnGatewayConnectionConfig.java b/Vcn/framework-b/src/android/net/vcn/VcnGatewayConnectionConfig.java index b270062cbf..067144e6f4 100644 --- a/Vcn/framework-b/src/android/net/vcn/VcnGatewayConnectionConfig.java +++ b/Vcn/framework-b/src/android/net/vcn/VcnGatewayConnectionConfig.java @@ -32,12 +32,12 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.ipsec.ike.IkeTunnelConnectionParams; import android.net.vcn.persistablebundleutils.TunnelConnectionParamsUtils; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.util.ArraySet; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; -import com.android.server.vcn.util.PersistableBundleUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/Vcn/framework-b/src/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java b/Vcn/framework-b/src/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java index c7b2f188ba..770a8c118a 100644 --- a/Vcn/framework-b/src/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java +++ b/Vcn/framework-b/src/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java @@ -17,22 +17,22 @@ package android.net.vcn; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY; +import static android.net.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER; +import static android.net.vcn.util.PersistableBundleUtils.STRING_SERIALIZER; import static com.android.internal.annotations.VisibleForTesting.Visibility; -import static com.android.server.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER; -import static com.android.server.vcn.util.PersistableBundleUtils.STRING_SERIALIZER; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.net.NetworkCapabilities; import android.net.vcn.VcnUnderlyingNetworkTemplate.MatchCriteria; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.util.ArraySet; import android.util.IndentingPrintWriter; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/ChildSaProposalUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/ChildSaProposalUtils.java index ce5ec75f01..48c1b25a97 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/ChildSaProposalUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/ChildSaProposalUtils.java @@ -20,10 +20,10 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility; import android.annotation.NonNull; import android.net.ipsec.ike.ChildSaProposal; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.util.List; import java.util.Objects; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/EapSessionConfigUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/EapSessionConfigUtils.java index 853a52da76..dc1ee36b71 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/EapSessionConfigUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/EapSessionConfigUtils.java @@ -28,10 +28,10 @@ import android.net.eap.EapSessionConfig.EapMsChapV2Config; import android.net.eap.EapSessionConfig.EapSimConfig; import android.net.eap.EapSessionConfig.EapTtlsConfig; import android.net.eap.EapSessionConfig.EapUiccConfig; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeIdentificationUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeIdentificationUtils.java index 6acb34ebb7..6e8616fc9c 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeIdentificationUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeIdentificationUtils.java @@ -27,10 +27,10 @@ import android.net.ipsec.ike.IkeIpv4AddrIdentification; import android.net.ipsec.ike.IkeIpv6AddrIdentification; import android.net.ipsec.ike.IkeKeyIdIdentification; import android.net.ipsec.ike.IkeRfc822AddrIdentification; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSaProposalUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSaProposalUtils.java index 1459671f41..b590148de5 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSaProposalUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSaProposalUtils.java @@ -20,10 +20,10 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility; import android.annotation.NonNull; import android.net.ipsec.ike.IkeSaProposal; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.util.List; import java.util.Objects; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java index d1531a119a..aefac2e89a 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java @@ -35,12 +35,12 @@ import android.net.ipsec.ike.IkeSessionParams.IkeAuthDigitalSignRemoteConfig; import android.net.ipsec.ike.IkeSessionParams.IkeAuthEapConfig; import android.net.ipsec.ike.IkeSessionParams.IkeAuthPskConfig; import android.net.ipsec.ike.IkeSessionParams.IkeConfigRequest; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.util.ArraySet; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.net.InetAddress; import java.security.PrivateKey; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/SaProposalUtilsBase.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/SaProposalUtilsBase.java index 0c9ee84327..469966a484 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/SaProposalUtilsBase.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/SaProposalUtilsBase.java @@ -18,11 +18,10 @@ package android.net.vcn.persistablebundleutils; import android.annotation.NonNull; import android.net.ipsec.ike.SaProposal; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.util.Pair; -import com.android.server.vcn.util.PersistableBundleUtils; - import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/TunnelModeChildSessionParamsUtils.java b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/TunnelModeChildSessionParamsUtils.java index e62acac14b..3f4ba345a1 100644 --- a/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/TunnelModeChildSessionParamsUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/persistablebundleutils/TunnelModeChildSessionParamsUtils.java @@ -34,11 +34,11 @@ import android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequestIpv4Netma import android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequestIpv6Address; import android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequestIpv6DnsServer; import android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest; +import android.net.vcn.util.PersistableBundleUtils; import android.os.PersistableBundle; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.vcn.util.PersistableBundleUtils; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/Vcn/framework-b/src/android/net/vcn/util/LogUtils.java b/Vcn/framework-b/src/android/net/vcn/util/LogUtils.java index 93728ceb27..7f7f852716 100644 --- a/Vcn/framework-b/src/android/net/vcn/util/LogUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/util/LogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; import android.annotation.Nullable; import android.os.ParcelUuid; diff --git a/Vcn/framework-b/src/android/net/vcn/util/MtuUtils.java b/Vcn/framework-b/src/android/net/vcn/util/MtuUtils.java index 356c71f5f2..c3123bcecf 100644 --- a/Vcn/framework-b/src/android/net/vcn/util/MtuUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/util/MtuUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_3DES; import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_CBC; diff --git a/Vcn/framework-b/src/android/net/vcn/util/OneWayBoolean.java b/Vcn/framework-b/src/android/net/vcn/util/OneWayBoolean.java index e79bb2d254..a7ef67b187 100644 --- a/Vcn/framework-b/src/android/net/vcn/util/OneWayBoolean.java +++ b/Vcn/framework-b/src/android/net/vcn/util/OneWayBoolean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; /** * OneWayBoolean is an abstraction for a boolean that MUST only ever be flipped from false to true diff --git a/Vcn/framework-b/src/android/net/vcn/util/PersistableBundleUtils.java b/Vcn/framework-b/src/android/net/vcn/util/PersistableBundleUtils.java index d6761a2b37..4dc42c7827 100644 --- a/Vcn/framework-b/src/android/net/vcn/util/PersistableBundleUtils.java +++ b/Vcn/framework-b/src/android/net/vcn/util/PersistableBundleUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/Vcn/service-b/src/com/android/server/VcnManagementService.java b/Vcn/service-b/src/com/android/server/VcnManagementService.java index 2012f5632a..a45b715cca 100644 --- a/Vcn/service-b/src/com/android/server/VcnManagementService.java +++ b/Vcn/service-b/src/com/android/server/VcnManagementService.java @@ -55,6 +55,8 @@ import android.net.vcn.VcnConfig; import android.net.vcn.VcnManager.VcnErrorCode; import android.net.vcn.VcnManager.VcnStatusCode; import android.net.vcn.VcnUnderlyingNetworkPolicy; +import android.net.vcn.util.PersistableBundleUtils; +import android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.net.wifi.WifiInfo; import android.os.Binder; import android.os.Build; @@ -90,8 +92,6 @@ import com.android.server.vcn.TelephonySubscriptionTracker; import com.android.server.vcn.Vcn; import com.android.server.vcn.VcnContext; import com.android.server.vcn.VcnNetworkProvider; -import com.android.server.vcn.util.PersistableBundleUtils; -import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import java.io.File; import java.io.FileDescriptor; diff --git a/Vcn/service-b/src/com/android/server/vcn/Android.bp b/Vcn/service-b/src/com/android/server/vcn/Android.bp deleted file mode 100644 index ab5da3ee45..0000000000 --- a/Vcn/service-b/src/com/android/server/vcn/Android.bp +++ /dev/null @@ -1,13 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], -} - -filegroup { - name: "framework-vcn-util-sources", - srcs: ["util/**/*.java"], -} diff --git a/Vcn/service-b/src/com/android/server/vcn/TelephonySubscriptionTracker.java b/Vcn/service-b/src/com/android/server/vcn/TelephonySubscriptionTracker.java index 3392d03910..154897eece 100644 --- a/Vcn/service-b/src/com/android/server/vcn/TelephonySubscriptionTracker.java +++ b/Vcn/service-b/src/com/android/server/vcn/TelephonySubscriptionTracker.java @@ -27,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.vcn.VcnManager; +import android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.os.Handler; import android.os.HandlerExecutor; import android.os.ParcelUuid; @@ -45,7 +46,6 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; -import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import java.util.ArrayList; import java.util.Collections; diff --git a/Vcn/service-b/src/com/android/server/vcn/Vcn.java b/Vcn/service-b/src/com/android/server/vcn/Vcn.java index 1fba29779f..95acb107fd 100644 --- a/Vcn/service-b/src/com/android/server/vcn/Vcn.java +++ b/Vcn/service-b/src/com/android/server/vcn/Vcn.java @@ -38,6 +38,7 @@ import android.net.Uri; import android.net.vcn.VcnConfig; import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnManager.VcnErrorCode; +import android.net.vcn.util.LogUtils; import android.os.Handler; import android.os.HandlerExecutor; import android.os.Message; @@ -54,7 +55,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; import com.android.server.VcnManagementService.VcnCallback; import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; -import com.android.server.vcn.util.LogUtils; import java.util.Arrays; import java.util.Collections; diff --git a/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java b/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java index 2325f358e3..9ccf0401e9 100644 --- a/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java +++ b/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java @@ -30,10 +30,10 @@ import static android.net.vcn.VcnGatewayConnectionConfig.VCN_GATEWAY_OPTION_ENAB import static android.net.vcn.VcnManager.VCN_ERROR_CODE_CONFIG_ERROR; import static android.net.vcn.VcnManager.VCN_ERROR_CODE_INTERNAL_ERROR; import static android.net.vcn.VcnManager.VCN_ERROR_CODE_NETWORK_ERROR; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.VcnManagementService.LOCAL_LOG; import static com.android.server.VcnManagementService.VDBG; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; @@ -78,6 +78,9 @@ import android.net.ipsec.ike.exceptions.IkeProtocolException; import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnManager; import android.net.vcn.VcnTransportInfo; +import android.net.vcn.util.LogUtils; +import android.net.vcn.util.MtuUtils; +import android.net.vcn.util.OneWayBoolean; import android.net.wifi.WifiInfo; import android.os.Handler; import android.os.HandlerExecutor; @@ -103,9 +106,6 @@ import com.android.server.vcn.Vcn.VcnGatewayStatusCallback; import com.android.server.vcn.routeselection.UnderlyingNetworkController; import com.android.server.vcn.routeselection.UnderlyingNetworkController.UnderlyingNetworkControllerCallback; import com.android.server.vcn.routeselection.UnderlyingNetworkRecord; -import com.android.server.vcn.util.LogUtils; -import com.android.server.vcn.util.MtuUtils; -import com.android.server.vcn.util.OneWayBoolean; import java.io.IOException; import java.net.Inet4Address; diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/IpSecPacketLossDetector.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/IpSecPacketLossDetector.java index 16ab51e8d6..e6a1ff9675 100644 --- a/Vcn/service-b/src/com/android/server/vcn/routeselection/IpSecPacketLossDetector.java +++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/IpSecPacketLossDetector.java @@ -16,8 +16,9 @@ package com.android.server.vcn.routeselection; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; + import static com.android.internal.annotations.VisibleForTesting.Visibility; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.IntDef; import android.annotation.NonNull; diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkMetricMonitor.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkMetricMonitor.java index 0d4c373677..86cee554be 100644 --- a/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkMetricMonitor.java +++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkMetricMonitor.java @@ -16,8 +16,9 @@ package com.android.server.vcn.routeselection; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; + import static com.android.server.VcnManagementService.LOCAL_LOG; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java index d32e5cc8ef..79c4116d0c 100644 --- a/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java +++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java @@ -23,9 +23,9 @@ import static android.net.NetworkCapabilities.TRANSPORT_TEST; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_FORBIDDEN; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_REQUIRED; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.VcnManagementService.LOCAL_LOG; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkController.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkController.java index 3eeeece5da..f7a564ad52 100644 --- a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkController.java +++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkController.java @@ -19,12 +19,12 @@ package com.android.server.vcn.routeselection; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_FORBIDDEN; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_REQUIRED; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListener; import static com.android.server.VcnManagementService.LOCAL_LOG; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.getWifiEntryRssiThreshold; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.getWifiExitRssiThreshold; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; @@ -39,6 +39,7 @@ import android.net.TelephonyNetworkSpecifier; import android.net.vcn.VcnCellUnderlyingNetworkTemplate; import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnUnderlyingNetworkTemplate; +import android.net.vcn.util.LogUtils; import android.os.Handler; import android.os.HandlerExecutor; import android.os.ParcelUuid; @@ -54,7 +55,6 @@ import com.android.internal.annotations.VisibleForTesting.Visibility; import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; import com.android.server.vcn.VcnContext; import com.android.server.vcn.routeselection.UnderlyingNetworkEvaluator.NetworkEvaluatorCallback; -import com.android.server.vcn.util.LogUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java index 08be11e296..30f4ed1b9f 100644 --- a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java +++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java @@ -16,8 +16,9 @@ package com.android.server.vcn.routeselection; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; + import static com.android.server.VcnManagementService.LOCAL_LOG; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/util/MtuUtilsTest.java b/Vcn/tests/unit/java/android/net/vcn/util/MtuUtilsTest.java similarity index 98% rename from Vcn/tests/unit/java/com/android/server/vcn/util/MtuUtilsTest.java rename to Vcn/tests/unit/java/android/net/vcn/util/MtuUtilsTest.java index e9e70783eb..47638b002f 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/util/MtuUtilsTest.java +++ b/Vcn/tests/unit/java/android/net/vcn/util/MtuUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_CBC; import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_12; @@ -22,10 +22,10 @@ import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_16; import static android.net.ipsec.ike.SaProposal.ENCRYPTION_ALGORITHM_AES_GCM_8; import static android.net.ipsec.ike.SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA2_256_128; import static android.net.ipsec.ike.SaProposal.KEY_LEN_AES_256; +import static android.net.vcn.util.MtuUtils.getMtu; import static com.android.net.module.util.NetworkStackConstants.ETHER_MTU; import static com.android.net.module.util.NetworkStackConstants.IPV6_MIN_MTU; -import static com.android.server.vcn.util.MtuUtils.getMtu; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java b/Vcn/tests/unit/java/android/net/vcn/util/PersistableBundleUtilsTest.java similarity index 99% rename from Vcn/tests/unit/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java rename to Vcn/tests/unit/java/android/net/vcn/util/PersistableBundleUtilsTest.java index 9c6d85238b..c84e60086b 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java +++ b/Vcn/tests/unit/java/android/net/vcn/util/PersistableBundleUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.vcn.util; +package android.net.vcn.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/Vcn/tests/unit/java/com/android/server/VcnManagementServiceTest.java b/Vcn/tests/unit/java/com/android/server/VcnManagementServiceTest.java index 4ab8e6abbb..26a2a06367 100644 --- a/Vcn/tests/unit/java/com/android/server/VcnManagementServiceTest.java +++ b/Vcn/tests/unit/java/com/android/server/VcnManagementServiceTest.java @@ -77,6 +77,8 @@ import android.net.vcn.VcnConfigTest; import android.net.vcn.VcnGatewayConnectionConfigTest; import android.net.vcn.VcnManager; import android.net.vcn.VcnUnderlyingNetworkPolicy; +import android.net.vcn.util.PersistableBundleUtils; +import android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.os.IBinder; import android.os.ParcelUuid; import android.os.PersistableBundle; @@ -99,8 +101,6 @@ import com.android.server.vcn.TelephonySubscriptionTracker; import com.android.server.vcn.Vcn; import com.android.server.vcn.VcnContext; import com.android.server.vcn.VcnNetworkProvider; -import com.android.server.vcn.util.PersistableBundleUtils; -import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import org.junit.Before; import org.junit.Rule; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java b/Vcn/tests/unit/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java index f1f74bca2e..b999475cba 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java @@ -19,6 +19,7 @@ package com.android.server.vcn; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.vcn.VcnManager.VCN_RESTRICTED_TRANSPORTS_INT_ARRAY_KEY; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static android.telephony.SubscriptionManager.INVALID_SIM_SLOT_INDEX; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; import static android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListener; @@ -26,7 +27,6 @@ import static android.telephony.TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionTrackerCallback; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index 20b7f1f146..76be232c2f 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -69,6 +69,7 @@ import android.net.vcn.VcnGatewayConnectionConfig; import android.net.vcn.VcnGatewayConnectionConfigTest; import android.net.vcn.VcnManager.VcnErrorCode; import android.net.vcn.VcnTransportInfo; +import android.net.vcn.util.MtuUtils; import android.os.PersistableBundle; import androidx.test.filters.SmallTest; @@ -79,7 +80,6 @@ import com.android.server.vcn.VcnGatewayConnection.VcnChildSessionConfiguration; import com.android.server.vcn.VcnGatewayConnection.VcnIkeSession; import com.android.server.vcn.VcnGatewayConnection.VcnNetworkAgent; import com.android.server.vcn.routeselection.UnderlyingNetworkRecord; -import com.android.server.vcn.util.MtuUtils; import org.junit.Before; import org.junit.Test; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionTest.java b/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionTest.java index 613b926167..b9fe76a24d 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/VcnGatewayConnectionTest.java @@ -25,13 +25,13 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.vcn.VcnGatewayConnectionConfig.VCN_GATEWAY_OPTION_ENABLE_DATA_STALL_RECOVERY_WITH_MOBILITY; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.vcn.VcnGatewayConnection.DUMMY_ADDR; import static com.android.server.vcn.VcnGatewayConnection.SAFEMODE_TIMEOUT_SECONDS; import static com.android.server.vcn.VcnGatewayConnection.VcnChildSessionConfiguration; import static com.android.server.vcn.VcnGatewayConnection.VcnIkeSession; import static com.android.server.vcn.VcnGatewayConnection.VcnNetworkAgent; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/IpSecPacketLossDetectorTest.java b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/IpSecPacketLossDetectorTest.java index 441a4ae6d9..5db02e376f 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/IpSecPacketLossDetectorTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/IpSecPacketLossDetectorTest.java @@ -19,11 +19,11 @@ package com.android.server.vcn.routeselection; import static android.net.vcn.VcnManager.VCN_NETWORK_SELECTION_IPSEC_PACKET_LOSS_PERCENT_THRESHOLD_KEY; import static android.net.vcn.VcnManager.VCN_NETWORK_SELECTION_MAX_SEQ_NUM_INCREASE_PER_SECOND_KEY; import static android.net.vcn.VcnManager.VCN_NETWORK_SELECTION_POLL_IPSEC_STATE_INTERVAL_SECONDS_KEY; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.vcn.routeselection.IpSecPacketLossDetector.IPSEC_PACKET_LOSS_PERCENT_THRESHOLD_DISABLE_DETECTOR; import static com.android.server.vcn.routeselection.IpSecPacketLossDetector.MIN_VALID_EXPECTED_RX_PACKET_NUM; import static com.android.server.vcn.routeselection.IpSecPacketLossDetector.getMaxSeqNumIncreasePerSecond; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java index d85c5150f5..4f34f9f8f7 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java @@ -23,13 +23,13 @@ import static android.net.vcn.VcnUnderlyingNetworkTemplateTestBase.TEST_MIN_ENTR import static android.net.vcn.VcnUnderlyingNetworkTemplateTestBase.TEST_MIN_ENTRY_UPSTREAM_BANDWIDTH_KBPS; import static android.net.vcn.VcnUnderlyingNetworkTemplateTestBase.TEST_MIN_EXIT_DOWNSTREAM_BANDWIDTH_KBPS; import static android.net.vcn.VcnUnderlyingNetworkTemplateTestBase.TEST_MIN_EXIT_UPSTREAM_BANDWIDTH_KBPS; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.PRIORITY_FALLBACK; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.PRIORITY_INVALID; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.checkMatchesCellPriorityRule; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.checkMatchesPriorityRule; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.checkMatchesWifiPriorityRule; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java index 1d6872195e..a315b0690e 100644 --- a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java +++ b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluatorTest.java @@ -17,9 +17,9 @@ package com.android.server.vcn.routeselection; import static android.net.vcn.VcnManager.VCN_NETWORK_SELECTION_PENALTY_TIMEOUT_MINUTES_LIST_KEY; +import static android.net.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.PRIORITY_INVALID; -import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;