LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 289759e0d2 am: dd9d8de53b

Browse Source 
am: cf038bfcd1

Change-Id: I80e3ebb556ac0b6bff5d232b881f7d869cb74f00
This commit is contained in:
Varun Anand
2019-03-19 09:47:04 -07:00
committed by android-build-merger
parent 07500d5d6f cf038bfcd1
commit 1a96a9997c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/net/NetworkTemplate.java
View File

@@ -40,6 +40,7 @@ import android.os.Parcelable;
import android.util.BackupUtils; import android.util.BackupUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -89,10 +90,22 @@ public class NetworkTemplate implements Parcelable {
private static boolean sForceAllNetworkTypes = false; private static boolean sForceAllNetworkTypes = false;
/**
* Results in matching against all mobile network types.
*
* <p>See {@link #matchesMobile} and {@link matchesMobileWildcard}.
*/
@VisibleForTesting
public static void forceAllNetworkTypes() { public static void forceAllNetworkTypes() {
sForceAllNetworkTypes = true; sForceAllNetworkTypes = true;
} }
/** Resets the affect of {@link #forceAllNetworkTypes}. */
@VisibleForTesting
public static void resetForceAllNetworkTypes() {
sForceAllNetworkTypes = false;
}
/** /**
* Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with * Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with
* the given IMSI. * the given IMSI.