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
2 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));
}