diff --git a/staticlibs/device/com/android/net/module/util/NetworkMonitorUtils.java b/staticlibs/device/com/android/net/module/util/NetworkMonitorUtils.java index f6cd044e4e..5a4412f506 100644 --- a/staticlibs/device/com/android/net/module/util/NetworkMonitorUtils.java +++ b/staticlibs/device/com/android/net/module/util/NetworkMonitorUtils.java @@ -16,6 +16,7 @@ package com.android.net.module.util; +import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; 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; @@ -102,9 +103,12 @@ public class NetworkMonitorUtils { * networks. * @param nc Network capabilities of the network to test. */ - public static boolean isValidationRequired(boolean isVpnValidationRequired, + public static boolean isValidationRequired(boolean isDunValidationRequired, + boolean isVpnValidationRequired, @NonNull final NetworkCapabilities nc) { - // TODO: Consider requiring validation for DUN networks. + if (isDunValidationRequired && nc.hasCapability(NET_CAPABILITY_DUN)) { + return true; + } if (!nc.hasCapability(NET_CAPABILITY_NOT_VPN)) { return isVpnValidationRequired; }