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

Add unit tests related to data accounting for VPNs with one underlying

Browse Source 
network.

This is to establish a baseline for the existing behavior, and to ensure
that following changes are not causing a regression in existing
behavior.

This CL is also adding missing cleanup for NetworkStatsCollectionTest
which was forcing all network types in NetworkTemplate that was causing
NetworkStatsService related tests to fail.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: I285f186cfb16bc9fa704c797996b1e4f8a73dee4
This commit is contained in:
Varun Anand
2019-02-17 23:15:15 -08:00
parent cdf8d71a9f
commit d8fdea1c6e
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.