From 8076110105df80eca38aa297b860dfe04d75ed1b Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 24 Oct 2022 11:11:05 +0900 Subject: [PATCH] Add option to validate DUN networks When isDunValidationRequired is true, networks with DUN capability will always be validated. Otherwise previous behavior will apply. Bug: 253989196 Test: atest NetworkMonitorTests Change-Id: I6e8bc7fcbf561f636abbf42ca69749fd0eabfd6c --- .../com/android/net/module/util/NetworkMonitorUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; }