joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add option to validate DUN networks" am: 8e2290acaf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2266845

Change-Id: I15b659cc9608c34d91c37adeb4e105ecb8034e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-11-04 11:52:31 +00:00 • committed by Automerger Merge Worker
commit b1f5ff04e8
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
staticlibs/device/com/android/net/module/util/NetworkMonitorUtils.java
View file

@ -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;
}