Merge "Remove networkstack-module-utils-srcs filegroup." am: b5ae476a1a Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2153735 Change-Id: Ib777eed0acf0ec4975f4fbda5b4993c4b0e23c4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index 2b3cfc2..6610ae6 100644 --- a/Android.bp +++ b/Android.bp
@@ -268,7 +268,6 @@ name: "NetworkStackAndroidLibraryDefaults", srcs: [ ":framework-networkstack-shared-srcs", - ":networkstack-module-utils-srcs", ], libs: ["unsupportedappusage"], static_libs: [
diff --git a/common/moduleutils/Android.bp b/common/moduleutils/Android.bp index a34e32d..11b3d6d 100644 --- a/common/moduleutils/Android.bp +++ b/common/moduleutils/Android.bp
@@ -25,23 +25,12 @@ name: "connectivity-module-utils-srcs", srcs: [ "src/android/net/shared/NetdUtils.java", - "src/android/net/shared/NetworkMonitorUtils.java", ], visibility: [ "//packages/modules/Connectivity/service", ] } -filegroup { - name: "networkstack-module-utils-srcs", - srcs: [ - "src/android/net/shared/*.java", - ], - visibility: [ - "//packages/modules/NetworkStack", - ] -} - // Shared utility sources to be used by tethering modules filegroup { name: "tethering-module-utils-srcs",
diff --git a/common/moduleutils/src/android/net/shared/NetworkMonitorUtils.java b/common/moduleutils/src/android/net/shared/NetworkMonitorUtils.java deleted file mode 100644 index 583a356..0000000 --- a/common/moduleutils/src/android/net/shared/NetworkMonitorUtils.java +++ /dev/null
@@ -1,114 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.shared; - -import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; -import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; -import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; -import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID; -import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED; -import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH; -import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; -import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET; -import static android.net.NetworkCapabilities.TRANSPORT_WIFI; - -import android.annotation.NonNull; -import android.net.NetworkCapabilities; - -import com.android.modules.utils.build.SdkLevel; -import com.android.networkstack.apishim.common.NetworkAgentConfigShim; - -/** @hide */ -public class NetworkMonitorUtils { - // This class is used by both NetworkMonitor and ConnectivityService, so it cannot use - // NetworkStack shims, but at the same time cannot use non-system APIs. - // TRANSPORT_TEST is test API as of R (so it is enforced to always be 7 and can't be changed), - // and it is being added as a system API in S. - // TODO: use NetworkCapabilities.TRANSPORT_TEST once NetworkStack builds against API 31. - private static final int TRANSPORT_TEST = 7; - - // This class is used by both NetworkMonitor and ConnectivityService, so it cannot use - // NetworkStack shims, but at the same time cannot use non-system APIs. - // NET_CAPABILITY_NOT_VCN_MANAGED is system API as of S (so it is enforced to always be 28 and - // can't be changed). - // TODO: use NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED once NetworkStack builds against - // API 31. - public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28; - - // Network conditions broadcast constants - public static final String ACTION_NETWORK_CONDITIONS_MEASURED = - "android.net.conn.NETWORK_CONDITIONS_MEASURED"; - public static final String EXTRA_CONNECTIVITY_TYPE = "extra_connectivity_type"; - public static final String EXTRA_NETWORK_TYPE = "extra_network_type"; - public static final String EXTRA_RESPONSE_RECEIVED = "extra_response_received"; - public static final String EXTRA_IS_CAPTIVE_PORTAL = "extra_is_captive_portal"; - public static final String EXTRA_CELL_ID = "extra_cellid"; - public static final String EXTRA_SSID = "extra_ssid"; - public static final String EXTRA_BSSID = "extra_bssid"; - /** real time since boot */ - public static final String EXTRA_REQUEST_TIMESTAMP_MS = "extra_request_timestamp_ms"; - public static final String EXTRA_RESPONSE_TIMESTAMP_MS = "extra_response_timestamp_ms"; - public static final String PERMISSION_ACCESS_NETWORK_CONDITIONS = - "android.permission.ACCESS_NETWORK_CONDITIONS"; - - /** - * Return whether validation is required for private DNS in strict mode. - * @param nc Network capabilities of the network to test. - */ - public static boolean isPrivateDnsValidationRequired(@NonNull final NetworkCapabilities nc) { - final boolean isVcnManaged = SdkLevel.isAtLeastS() - && !nc.hasCapability(NET_CAPABILITY_NOT_VCN_MANAGED); - final boolean isOemPaid = nc.hasCapability(NET_CAPABILITY_OEM_PAID) - && nc.hasCapability(NET_CAPABILITY_TRUSTED); - final boolean isDefaultCapable = nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED) - && nc.hasCapability(NET_CAPABILITY_TRUSTED); - - // TODO: Consider requiring validation for DUN networks. - if (nc.hasCapability(NET_CAPABILITY_INTERNET) - && (isVcnManaged || isOemPaid || isDefaultCapable)) { - return true; - } - - // Test networks that also have one of the major transport types are attempting to replicate - // that transport on a test interface (for example, test ethernet networks with - // EthernetManager#setIncludeTestInterfaces). Run validation on them for realistic tests. - // See also comments on EthernetManager#setIncludeTestInterfaces and on TestNetworkManager. - if (nc.hasTransport(TRANSPORT_TEST) && nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED) && ( - nc.hasTransport(TRANSPORT_WIFI) - || nc.hasTransport(TRANSPORT_CELLULAR) - || nc.hasTransport(TRANSPORT_BLUETOOTH) - || nc.hasTransport(TRANSPORT_ETHERNET))) { - return true; - } - - return false; - } - - /** - * Return whether validation is required for a network. - * @param config Configuration of the network to test. - * @param nc Network capabilities of the network to test. - */ - public static boolean isValidationRequired(@NonNull final NetworkAgentConfigShim config, - @NonNull final NetworkCapabilities nc) { - // TODO: Consider requiring validation for DUN networks. - if (!nc.hasCapability(NET_CAPABILITY_NOT_VPN)) { - return config.isVpnValidationRequired(); - } - return isPrivateDnsValidationRequired(nc); - } -}
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 78f717e..84081b5 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -114,7 +114,6 @@ import android.net.metrics.NetworkEvent; import android.net.metrics.ValidationProbeEvent; import android.net.networkstack.aidl.NetworkMonitorParameters; -import android.net.shared.NetworkMonitorUtils; import android.net.shared.PrivateDnsConfig; import android.net.util.DataStallUtils.EvaluationType; import android.net.util.NetworkStackUtils; @@ -159,6 +158,7 @@ import com.android.internal.util.StateMachine; import com.android.modules.utils.build.SdkLevel; import com.android.net.module.util.DeviceConfigUtils; +import com.android.net.module.util.NetworkMonitorUtils; import com.android.net.module.util.NetworkStackConstants; import com.android.net.module.util.SharedLog; import com.android.networkstack.NetworkStackNotifier; @@ -781,7 +781,8 @@ } private boolean isValidationRequired() { - return NetworkMonitorUtils.isValidationRequired(mNetworkAgentConfig, mNetworkCapabilities); + return NetworkMonitorUtils.isValidationRequired( + mNetworkAgentConfig.isVpnValidationRequired(), mNetworkCapabilities); } private boolean isPrivateDnsValidationRequired() {