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 kill switch for storing transport types" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-06-10 16:52:20 -07:00 • committed by Android (Google) Code Review
commit 4be13fb54d
9 changed files with 163 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

18
framework-t/src/android/net/NetworkIdentitySet.java
View file

@ -50,8 +50,10 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
private static final int VERSION_ADD_METERED = 4;
private static final int VERSION_ADD_DEFAULT_NETWORK = 5;
private static final int VERSION_ADD_OEM_MANAGED_NETWORK = 6;
private static final int VERSION_ADD_SUB_ID = 7;
private static final int VERSION_ADD_TRANSPORT_TYPES = 8;
@VisibleForTesting
public static final int VERSION_ADD_SUB_ID = 7;
@VisibleForTesting
public static final int VERSION_ADD_TRANSPORT_TYPES = 8;
/**
* Construct a {@link NetworkIdentitySet} object.
@ -144,8 +146,12 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
* Method to serialize this object into a {@code DataOutput}.
* @hide
*/
public void writeToStream(DataOutput out) throws IOException {
out.writeInt(VERSION_ADD_TRANSPORT_TYPES);
public void writeToStream(DataOutput out, boolean storeTransportTypes) throws IOException {
if (storeTransportTypes) {
out.writeInt(VERSION_ADD_TRANSPORT_TYPES);
} else {
out.writeInt(VERSION_ADD_SUB_ID);
}
out.writeInt(size());
for (NetworkIdentity ident : this) {
out.writeInt(ident.getType());
@ -157,7 +163,9 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
out.writeBoolean(ident.isDefaultNetwork());
out.writeInt(ident.getOemManaged());
out.writeInt(ident.getSubId());
out.writeLong(BitUtils.packBits(toIntArray(ident.getTransportTypes())));
if (storeTransportTypes) {
out.writeLong(BitUtils.packBits(toIntArray(ident.getTransportTypes())));
}
}
}

26
framework-t/src/android/net/NetworkStatsCollection.java
View file

@ -118,27 +118,21 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
private long mTotalBytes;
private boolean mDirty;
private final boolean mUseFastDataInput;
/**
* Construct a {@link NetworkStatsCollection} object.
*
* @param bucketDurationMillis duration of the buckets in this object, in milliseconds.
* @hide
*/
public NetworkStatsCollection(long bucketDurationMillis) {
this(bucketDurationMillis, false /* useFastDataInput */);
}
private final boolean mStoreTransportTypes;
/**
* Construct a {@link NetworkStatsCollection} object.
*
* @param bucketDurationMillis duration of the buckets in this object, in milliseconds.
* @param useFastDataInput true if using {@link FastDataInput} is preferred. Otherwise, false.
* @param storeTransportTypes true if storing transport types is supported. Otherwise, false.
* @hide
*/
public NetworkStatsCollection(long bucketDurationMillis, boolean useFastDataInput) {
public NetworkStatsCollection(long bucketDurationMillis, boolean useFastDataInput,
boolean storeTransportTypes) {
mBucketDurationMillis = bucketDurationMillis;
mUseFastDataInput = useFastDataInput;
mStoreTransportTypes = storeTransportTypes;
reset();
}
@ -563,7 +557,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
out.writeInt(keysByIdent.size());
for (NetworkIdentitySet ident : keysByIdent.keySet()) {
final ArrayList<Key> keys = keysByIdent.get(ident);
ident.writeToStream(out);
ident.writeToStream(out, mStoreTransportTypes);
out.writeInt(keys.size());
for (Key key : keys) {
@ -935,8 +929,14 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
*/
@NonNull
public NetworkStatsCollection build() {
// If this object is OEM-created, especially for data migration,
// `storeTransportTypes` is set to `false` because older data lacks transport types.
// The file will be rewritten with transport types later if the feature is enabled.
// For OEM objects not used by the importer, this flag remains `false` as
// transport types aren't applicable yet, indicating the new feature isn't available.
final NetworkStatsCollection collection =
new NetworkStatsCollection(mBucketDurationMillis);
new NetworkStatsCollection(mBucketDurationMillis, false /* useFastDataInput */,
false /* storeTransportTypes */);
for (int i = 0; i < mEntries.size(); i++) {
collection.recordHistory(mEntries.keyAt(i), mEntries.valueAt(i));
}

38
service-t/src/com/android/server/net/NetworkStatsRecorder.java
View file

@ -84,6 +84,7 @@ public class NetworkStatsRecorder {
private final boolean mOnlyTags;
private final boolean mWipeOnError;
private final boolean mUseFastDataInput;
private final boolean mStoreTransportTypes;
private long mPersistThresholdBytes = 2 * MB_IN_BYTES;
private NetworkStats mLastSnapshot;
@ -113,9 +114,14 @@ public class NetworkStatsRecorder {
mOnlyTags = false;
mWipeOnError = true;
mUseFastDataInput = false;
mStoreTransportTypes = true;
mPending = null;
mSinceBoot = new NetworkStatsCollection(mBucketDuration);
// This is only used to track usage inside the observer, which doesn't read/write
// from/to persistent files. It is guaranteed that the file won't be written
// because the rotator is null.
mSinceBoot = new NetworkStatsCollection(mBucketDuration, mUseFastDataInput,
mStoreTransportTypes);
mPendingRewriter = null;
mStatsDir = null;
@ -126,7 +132,8 @@ public class NetworkStatsRecorder {
*/
public NetworkStatsRecorder(FileRotator rotator, NonMonotonicObserver<String> observer,
DropBoxManager dropBox, String cookie, long bucketDuration, boolean onlyTags,
boolean wipeOnError, boolean useFastDataInput, @Nullable File statsDir) {
boolean wipeOnError, boolean useFastDataInput, boolean storeTransportTypes,
@Nullable File statsDir) {
mRotator = Objects.requireNonNull(rotator, "missing FileRotator");
mObserver = Objects.requireNonNull(observer, "missing NonMonotonicObserver");
mDropBox = Objects.requireNonNull(dropBox, "missing DropBoxManager");
@ -136,9 +143,12 @@ public class NetworkStatsRecorder {
mOnlyTags = onlyTags;
mWipeOnError = wipeOnError;
mUseFastDataInput = useFastDataInput;
mStoreTransportTypes = storeTransportTypes;
mPending = new NetworkStatsCollection(bucketDuration);
mSinceBoot = new NetworkStatsCollection(bucketDuration);
mPending = new NetworkStatsCollection(bucketDuration, mUseFastDataInput,
mStoreTransportTypes);
mSinceBoot = new NetworkStatsCollection(bucketDuration, mUseFastDataInput,
mStoreTransportTypes);
mPendingRewriter = new CombiningRewriter(mPending);
mStatsDir = statsDir;
@ -220,7 +230,8 @@ public class NetworkStatsRecorder {
+ " useFastDataInput: " + mUseFastDataInput);
}
final NetworkStatsCollection res =
new NetworkStatsCollection(mBucketDuration, mUseFastDataInput);
new NetworkStatsCollection(mBucketDuration, mUseFastDataInput,
mStoreTransportTypes);
try {
mRotator.readMatching(res, start, end);
res.recordCollection(mPending);
@ -353,7 +364,9 @@ public class NetworkStatsRecorder {
if (mRotator != null) {
try {
// Rewrite all persisted data to migrate UID stats
mRotator.rewriteAll(new RemoveUidRewriter(mBucketDuration, uids));
final NetworkStatsCollection temp = new NetworkStatsCollection(mBucketDuration,
mUseFastDataInput, mStoreTransportTypes);
mRotator.rewriteAll(new RemoveUidRewriter(temp, uids));
} catch (IOException e) {
Log.wtf(TAG, "problem removing UIDs " + Arrays.toString(uids), e);
recoverAndDeleteData();
@ -422,8 +435,8 @@ public class NetworkStatsRecorder {
private final NetworkStatsCollection mTemp;
private final int[] mUids;
public RemoveUidRewriter(long bucketDuration, int[] uids) {
mTemp = new NetworkStatsCollection(bucketDuration);
public RemoveUidRewriter(@NonNull NetworkStatsCollection temp, int[] uids) {
mTemp = temp;
mUids = uids;
}
@ -475,8 +488,8 @@ public class NetworkStatsRecorder {
private final NetworkStatsCollection mTemp;
private final long mCutoffMills;
public RemoveDataBeforeRewriter(long bucketDuration, long cutoffMills) {
mTemp = new NetworkStatsCollection(bucketDuration);
public RemoveDataBeforeRewriter(@NonNull NetworkStatsCollection temp, long cutoffMills) {
mTemp = temp;
mCutoffMills = cutoffMills;
}
@ -509,8 +522,9 @@ public class NetworkStatsRecorder {
public void removeDataBefore(long cutoffMillis) throws IOException {
if (mRotator != null) {
try {
mRotator.rewriteAll(new RemoveDataBeforeRewriter(
mBucketDuration, cutoffMillis));
final NetworkStatsCollection temp = new NetworkStatsCollection(mBucketDuration,
mUseFastDataInput, mStoreTransportTypes);
mRotator.rewriteAll(new RemoveDataBeforeRewriter(temp, cutoffMillis));
} catch (IOException e) {
Log.wtf(TAG, "problem importing netstats", e);
recoverAndDeleteData();

15
service-t/src/com/android/server/net/NetworkStatsService.java
View file

@ -499,6 +499,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@VisibleForTesting
public static final String TRAFFICSTATS_CLIENT_RATE_LIMIT_CACHE_ENABLED_FLAG =
"trafficstats_client_rate_limit_cache_enabled_flag";
@VisibleForTesting
public static final String STORE_TRANSPORT_TYPES = "store_transport_types";
static final String TRAFFICSTATS_SERVICE_RATE_LIMIT_CACHE_ENABLED_FLAG =
"trafficstats_rate_limit_cache_enabled_flag";
static final String BROADCAST_NETWORK_STATS_UPDATED_RATE_LIMIT_ENABLED_FLAG =
@ -694,6 +696,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mIfaceStatsMap = mDeps.getIfaceStatsMap();
// To prevent any possible races, the flag is not allowed to change until rebooting.
mSupportEventLogger = mDeps.supportEventLogger(mContext);
mStoreTransportTypes =
mDeps.isTetheringFeatureNotChickenedOut(mContext, STORE_TRANSPORT_TYPES);
if (mSupportEventLogger) {
mEventLogger = new NetworkStatsEventLogger();
} else {
@ -983,6 +987,13 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
ctx, BROADCAST_NETWORK_STATS_UPDATED_RATE_LIMIT_ENABLED_FLAG);
}
/**
* @see DeviceConfigUtils#isTetheringFeatureNotChickenedOut
*/
public boolean isTetheringFeatureNotChickenedOut(Context ctx, String feature) {
return DeviceConfigUtils.isTetheringFeatureNotChickenedOut(ctx, feature);
}
/**
* Get client side traffic stats rate-limit cache config.
*
@ -1185,7 +1196,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
return new NetworkStatsRecorder(new FileRotator(
baseDir, prefix, config.rotateAgeMillis, config.deleteAgeMillis),
mNonMonotonicObserver, dropBox, prefix, config.bucketDuration, includeTags,
wipeOnError, useFastDataInput, baseDir);
wipeOnError, useFastDataInput, mStoreTransportTypes, baseDir);
}
@GuardedBy("mStatsLock")
@ -3061,6 +3072,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
}
pw.println(CONFIG_ENABLE_NETWORK_STATS_EVENT_LOGGER + ": " + mSupportEventLogger);
pw.println(STORE_TRANSPORT_TYPES + ": " + mStoreTransportTypes);
pw.print(NETSTATS_FASTDATAINPUT_TARGET_ATTEMPTS,
mDeps.getUseFastDataInputTargetAttempts());
pw.println();
@ -3627,6 +3639,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
private final boolean mSupportEventLogger;
private final boolean mStoreTransportTypes;
@GuardedBy("mStatsLock")
@Nullable
private final NetworkStatsEventLogger mEventLogger;

17
tests/benchmark/src/android/net/netstats/benchmarktests/NetworkStatsTest.kt
View file

@ -72,7 +72,7 @@ class NetworkStatsTest {
repeat(FILE_CACHE_WARM_UP_REPEAT_COUNT) {
testFilesAssets.forEach {
val uidTestFiles = getSortedListForPrefix(it, "uid")
val collection = NetworkStatsCollection(UID_COLLECTION_BUCKET_DURATION_MS)
val collection = buildNetworkStatsCollection(UID_COLLECTION_BUCKET_DURATION_MS)
for (file in uidTestFiles) {
readFile(file, collection)
}
@ -117,6 +117,13 @@ class NetworkStatsTest {
BufferedInputStream(file.inputStream()).use {
reader.read(it)
}
private fun buildNetworkStatsCollection(bucketDuration: Long) =
NetworkStatsCollection(
bucketDuration,
false /* useFastDataInput */,
true /* storeTransportTypes */
)
}
@Test
@ -125,7 +132,7 @@ class NetworkStatsTest {
// this a number of time to have a stable number.
testFilesAssets.forEach {
val uidTestFiles = getSortedListForPrefix(it, "uid")
val collection = NetworkStatsCollection(UID_COLLECTION_BUCKET_DURATION_MS)
val collection = buildNetworkStatsCollection(UID_COLLECTION_BUCKET_DURATION_MS)
for (file in uidTestFiles) {
readFile(file, collection)
}
@ -148,7 +155,10 @@ class NetworkStatsTest {
testFilesAssets.forEach {
val recorder = NetworkStatsRecorder(
FileRotator(
it, PREFIX_UID, UID_RECORDER_ROTATE_AGE_MS, UID_RECORDER_DELETE_AGE_MS
it,
PREFIX_UID,
UID_RECORDER_ROTATE_AGE_MS,
UID_RECORDER_DELETE_AGE_MS
),
mockObserver,
mockDropBox,
@ -157,6 +167,7 @@ class NetworkStatsTest {
false /* includeTags */,
false /* wipeOnError */,
useFastDataInput /* useFastDataInput */,
true /* storeTransportTypes */,
it
)
recorder.orLoadCompleteLocked

52
tests/unit/java/android/net/NetworkIdentitySetTest.kt
View file

@ -29,6 +29,7 @@ import android.net.NetworkCapabilities.TRANSPORT_ETHERNET
import android.net.NetworkCapabilities.TRANSPORT_TEST
import android.net.NetworkCapabilities.TRANSPORT_VPN
import android.net.NetworkCapabilities.TRANSPORT_WIFI
import android.net.NetworkIdentitySet.VERSION_ADD_SUB_ID
import android.net.NetworkIdentitySet.writeOptionalString
import android.os.Build
import android.telephony.TelephonyManager
@ -121,7 +122,7 @@ class NetworkIdentitySetTest {
val baos = ByteArrayOutputStream()
val outDataStream = DataOutputStream(baos)
originalSet.writeToStream(outDataStream)
originalSet.writeToStream(outDataStream, true /* storeTransportTypes */)
val bais = ByteArrayInputStream(baos.toByteArray())
val inDataStream = DataInputStream(bais)
@ -151,17 +152,17 @@ class NetworkIdentitySetTest {
}
@Test
fun testMigrateToSupportTransportTypes() {
doTestMigrateToSupportTransportTypes(TYPE_MOBILE, TRANSPORT_CELLULAR)
doTestMigrateToSupportTransportTypes(TYPE_WIFI, TRANSPORT_WIFI)
doTestMigrateToSupportTransportTypes(TYPE_BLUETOOTH, TRANSPORT_BLUETOOTH)
doTestMigrateToSupportTransportTypes(TYPE_ETHERNET, TRANSPORT_ETHERNET)
doTestMigrateToSupportTransportTypes(TYPE_VPN, TRANSPORT_VPN)
doTestMigrateToSupportTransportTypes(TYPE_TEST, TRANSPORT_TEST)
doTestMigrateToSupportTransportTypes(TYPE_WIMAX)
fun testMigrateToStoreTransportTypes() {
doTestMigrateToStoreTransportTypes(TYPE_MOBILE, TRANSPORT_CELLULAR)
doTestMigrateToStoreTransportTypes(TYPE_WIFI, TRANSPORT_WIFI)
doTestMigrateToStoreTransportTypes(TYPE_BLUETOOTH, TRANSPORT_BLUETOOTH)
doTestMigrateToStoreTransportTypes(TYPE_ETHERNET, TRANSPORT_ETHERNET)
doTestMigrateToStoreTransportTypes(TYPE_VPN, TRANSPORT_VPN)
doTestMigrateToStoreTransportTypes(TYPE_TEST, TRANSPORT_TEST)
doTestMigrateToStoreTransportTypes(TYPE_WIMAX)
}
private fun doTestMigrateToSupportTransportTypes(
private fun doTestMigrateToStoreTransportTypes(
legacyNetworkType: Int,
vararg expectedTransportTypes: Int
) {
@ -184,4 +185,35 @@ class NetworkIdentitySetTest {
assertEquals(expectedSet, deserializedSet)
}
@Test
fun testDowngradeFromStoreTransportTypes() {
val originalSet = NetworkIdentitySet()
originalSet.add(buildNetworkIdentity(TYPE_MOBILE, TRANSPORT_CELLULAR))
originalSet.add(buildNetworkIdentity(TYPE_WIFI, TRANSPORT_VPN, TRANSPORT_WIFI))
val baos = ByteArrayOutputStream()
val outDataStream = DataOutputStream(baos)
// Write to stream with storeTransportTypes disabled.
originalSet.writeToStream(outDataStream, false /* storeTransportTypes */)
val bais = ByteArrayInputStream(baos.toByteArray())
val inDataStream = DataInputStream(bais)
// Verify the output is in the corresponding format.
val version = inDataStream.readInt()
val size = inDataStream.readInt()
assertEquals(VERSION_ADD_SUB_ID, version)
assertEquals(2, size)
// Generate expected identity set with deduced transport type.
val expectedSet = NetworkIdentitySet()
expectedSet.add(buildNetworkIdentity(TYPE_MOBILE, TRANSPORT_CELLULAR))
expectedSet.add(buildNetworkIdentity(TYPE_WIFI, TRANSPORT_WIFI))
// Verify the transport types are from deduced transport type.
inDataStream.reset()
val deserializedSet = NetworkIdentitySet(inDataStream)
assertEquals(expectedSet, deserializedSet)
}
}

36
tests/unit/java/android/net/NetworkStatsCollectionTest.java
View file

@ -119,13 +119,19 @@ public class NetworkStatsCollectionTest {
RecurrenceRule.sClock = Clock.fixed(instant, ZoneId.systemDefault());
}
private NetworkStatsCollection buildNetworkStatsCollection(long bucketDuration) {
return new NetworkStatsCollection(bucketDuration, false /* useFastDataInput */,
true /* storeTransportTypes */);
}
@Test
public void testReadLegacyNetwork() throws Exception {
final File testFile =
new File(InstrumentationRegistry.getContext().getFilesDir(), TEST_FILE);
stageFile(R.raw.netstats_v1, testFile);
final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection =
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
collection.readLegacyNetwork(testFile);
// verify that history read correctly
@ -153,7 +159,8 @@ public class NetworkStatsCollectionTest {
new File(InstrumentationRegistry.getContext().getFilesDir(), TEST_FILE);
stageFile(R.raw.netstats_uid_v4, testFile);
final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection =
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
collection.readLegacyUid(testFile, false);
// verify that history read correctly
@ -181,7 +188,8 @@ public class NetworkStatsCollectionTest {
new File(InstrumentationRegistry.getContext().getFilesDir(), TEST_FILE);
stageFile(R.raw.netstats_uid_v4, testFile);
final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection =
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
collection.readLegacyUid(testFile, true);
// verify that history read correctly
@ -208,7 +216,8 @@ public class NetworkStatsCollectionTest {
new File(InstrumentationRegistry.getContext().getFilesDir(), TEST_FILE);
stageFile(uidRes, testFile);
final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection =
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
collection.readLegacyUid(testFile, true);
// now export into a unified format
@ -220,9 +229,11 @@ public class NetworkStatsCollectionTest {
@Test
public void testFastDataInputRead() throws Exception {
final NetworkStatsCollection legacyCollection =
new NetworkStatsCollection(30 * MINUTE_IN_MILLIS, false /* useFastDataInput */);
new NetworkStatsCollection(30 * MINUTE_IN_MILLIS, false /* useFastDataInput */,
true /* storeTransportTypes */);
final NetworkStatsCollection fastReadCollection =
new NetworkStatsCollection(30 * MINUTE_IN_MILLIS, true /* useFastDataInput */);
new NetworkStatsCollection(30 * MINUTE_IN_MILLIS, true /* useFastDataInput */,
true /* storeTransportTypes */);
final InputStream bis = getUidInputStreamFromRes(R.raw.netstats_uid_v4);
legacyCollection.read(bis);
bis.reset();
@ -232,7 +243,7 @@ public class NetworkStatsCollectionTest {
@Test
public void testStartEndAtomicBuckets() throws Exception {
final NetworkStatsCollection collection = new NetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkStatsCollection collection = buildNetworkStatsCollection(HOUR_IN_MILLIS);
// record empty data straddling between buckets
final NetworkStats.Entry entry = new NetworkStats.Entry();
@ -247,7 +258,7 @@ public class NetworkStatsCollectionTest {
@Test
public void testAccessLevels() throws Exception {
final NetworkStatsCollection collection = new NetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkStatsCollection collection = buildNetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkStats.Entry entry = new NetworkStats.Entry();
final NetworkIdentitySet identSet = new NetworkIdentitySet();
identSet.add(new NetworkIdentity(TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN,
@ -314,8 +325,9 @@ public class NetworkStatsCollectionTest {
stageFile(R.raw.netstats_v1, testFile);
final NetworkStatsCollection emptyCollection =
new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection = new NetworkStatsCollection(30 * MINUTE_IN_MILLIS);
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
final NetworkStatsCollection collection =
buildNetworkStatsCollection(30 * MINUTE_IN_MILLIS);
collection.readLegacyNetwork(testFile);
// We're in the future, but not that far off
@ -511,7 +523,7 @@ public class NetworkStatsCollectionTest {
setClock(Instant.parse("2012-06-01T00:00:00.00Z"));
// Create a simple history with a ton of measured usage
final NetworkStatsCollection large = new NetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkStatsCollection large = buildNetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkIdentitySet ident = new NetworkIdentitySet();
ident.add(new NetworkIdentity(ConnectivityManager.TYPE_MOBILE, -1, TEST_IMSI, null,
false, true, true, OEM_NONE, TEST_SUBID,
@ -532,7 +544,7 @@ public class NetworkStatsCollectionTest {
@Test
public void testRounding() throws Exception {
final NetworkStatsCollection coll = new NetworkStatsCollection(HOUR_IN_MILLIS);
final NetworkStatsCollection coll = buildNetworkStatsCollection(HOUR_IN_MILLIS);
// Special values should remain unchanged
for (long time : new long[] {

14
tests/unit/java/android/net/NetworkStatsRecorderTest.java
View file

@ -83,10 +83,16 @@ public final class NetworkStatsRecorderTest {
MockitoAnnotations.initMocks(this);
}
private NetworkStatsCollection buildNetworkStatsCollection(long bucketDuration) {
return new NetworkStatsCollection(bucketDuration, false /* useFastDataInput */,
true /* storeTransportTypes */);
}
private NetworkStatsRecorder buildRecorder(FileRotator rotator, boolean wipeOnError) {
return new NetworkStatsRecorder(rotator, mObserver, mDropBox, TEST_PREFIX,
HOUR_IN_MILLIS, false /* includeTags */, wipeOnError,
false /* useFastDataInput */, null /* baseDir */);
false /* useFastDataInput */, true /* storeTransportType */,
null /* baseDir */);
}
@Test
@ -110,7 +116,7 @@ public final class NetworkStatsRecorderTest {
@Test
public void testFileReadingMetrics_empty() {
final NetworkStatsCollection collection = new NetworkStatsCollection(30);
final NetworkStatsCollection collection = buildNetworkStatsCollection(30);
final NetworkStatsMetricsLogger.Dependencies deps =
mock(NetworkStatsMetricsLogger.Dependencies.class);
final NetworkStatsMetricsLogger logger = new NetworkStatsMetricsLogger(deps);
@ -146,7 +152,7 @@ public final class NetworkStatsRecorderTest {
@Test
public void testFileReadingMetrics() {
final NetworkStatsCollection collection = new NetworkStatsCollection(30);
final NetworkStatsCollection collection = buildNetworkStatsCollection(30);
final NetworkStats.Entry entry = new NetworkStats.Entry();
final NetworkIdentitySet identSet = new NetworkIdentitySet();
identSet.add(new NetworkIdentity.Builder().build());
@ -177,7 +183,7 @@ public final class NetworkStatsRecorderTest {
@Test
public void testFileReadingMetrics_fileAttributes() throws IOException {
final NetworkStatsCollection collection = new NetworkStatsCollection(30);
final NetworkStatsCollection collection = buildNetworkStatsCollection(30);
// Create files for testing. Only the first and the third files should be counted,
// with total 26 (each char takes 2 bytes) bytes in the content.

8
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View file

@ -619,6 +619,12 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
return true;
}
@Override
public boolean isTetheringFeatureNotChickenedOut(@NonNull Context cts,
@NonNull String feature) {
return mFeatureFlags.getOrDefault(feature, true);
}
@Override
public boolean isTrafficStatsServiceRateLimitCacheEnabled(Context ctx,
boolean isClientCacheEnabled) {
@ -2676,7 +2682,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
return new NetworkStatsRecorder(new FileRotator(
directory, prefix, config.rotateAgeMillis, config.deleteAgeMillis),
observer, dropBox, prefix, config.bucketDuration, includeTags, wipeOnError,
false /* useFastDataInput */, directory);
false /* useFastDataInput */, true /* storeTransportTypes */, directory);
}
private NetworkStatsCollection getLegacyCollection(String prefix, boolean includeTags) {