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

Merge "Refactor grouped by methods" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-01 07:27:06 +00:00
committed by Gerrit Code Review
parent dc9cb1da23 0b9c0835b9
commit 15f0a621f8
1 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
framework-t/src/android/net/NetworkStats.java
View File

@@ -46,6 +46,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.function.Predicate;
/**
@@ -455,6 +456,41 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent
return operations;
}
/**
* Set Key fields for this entry.
*
* @return this object.
* @hide
*/
private Entry setKeys(@Nullable String iface, int uid, @State int set,
int tag, @Meteredness int metered, @Roaming int roaming,
@DefaultNetwork int defaultNetwork) {
this.iface = iface;
this.uid = uid;
this.set = set;
this.tag = tag;
this.metered = metered;
this.roaming = roaming;
this.defaultNetwork = defaultNetwork;
return this;
}
/**
* Set Value fields for this entry.
*
* @return this object.
* @hide
*/
private Entry setValues(long rxBytes, long rxPackets, long txBytes, long txPackets,
long operations) {
this.rxBytes = rxBytes;
this.rxPackets = rxPackets;
this.txBytes = txBytes;
this.txPackets = txPackets;
this.operations = operations;
return this;
}
@Override
public String toString() {
final StringBuilder builder = new StringBuilder();
@@ -1210,30 +1246,21 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent
* @hide
*/
public NetworkStats groupedByIface() {
final NetworkStats stats = new NetworkStats(elapsedRealtime, 10);
// Keep backward compatibility where the method filtered out tagged stats and keep the
// operation counts as 0. The method used to deal with uid snapshot where tagged and
// non-tagged stats were mixed. And this method was also in Android O API list,
// so it is possible OEM can access it.
final NetworkStats copiedStats = this.clone();
copiedStats.filter(e -> e.getTag() == TAG_NONE);
final Entry entry = new Entry();
entry.uid = UID_ALL;
entry.set = SET_ALL;
entry.tag = TAG_NONE;
entry.metered = METERED_ALL;
entry.roaming = ROAMING_ALL;
entry.defaultNetwork = DEFAULT_NETWORK_ALL;
entry.operations = 0L;
final Entry temp = new Entry();
final NetworkStats mappedStats = copiedStats.map(entry -> temp.setKeys(entry.getIface(),
UID_ALL, SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL));
for (int i = 0; i < size; i++) {
// skip specific tags, since already counted in TAG_NONE
if (tag[i] != TAG_NONE) continue;
entry.iface = iface[i];
entry.rxBytes = rxBytes[i];
entry.rxPackets = rxPackets[i];
entry.txBytes = txBytes[i];
entry.txPackets = txPackets[i];
stats.combineValues(entry);
for (int i = 0; i < mappedStats.size; i++) {
mappedStats.operations[i] = 0L;
}
return stats;
return mappedStats;
}
/**
@@ -1242,30 +1269,15 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent
* @hide
*/
public NetworkStats groupedByUid() {
final NetworkStats stats = new NetworkStats(elapsedRealtime, 10);
// Keep backward compatibility where the method filtered out tagged stats. The method used
// to deal with uid snapshot where tagged and non-tagged stats were mixed. And
// this method is also in Android O API list, so it is possible OEM can access it.
final NetworkStats copiedStats = this.clone();
copiedStats.filter(e -> e.getTag() == TAG_NONE);
final Entry entry = new Entry();
entry.iface = IFACE_ALL;
entry.set = SET_ALL;
entry.tag = TAG_NONE;
entry.metered = METERED_ALL;
entry.roaming = ROAMING_ALL;
entry.defaultNetwork = DEFAULT_NETWORK_ALL;
for (int i = 0; i < size; i++) {
// skip specific tags, since already counted in TAG_NONE
if (tag[i] != TAG_NONE) continue;
entry.uid = uid[i];
entry.rxBytes = rxBytes[i];
entry.rxPackets = rxPackets[i];
entry.txBytes = txBytes[i];
entry.txPackets = txPackets[i];
entry.operations = operations[i];
stats.combineValues(entry);
}
return stats;
final Entry temp = new Entry();
return copiedStats.map(entry -> temp.setKeys(IFACE_ALL,
entry.getUid(), SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL));
}
/**
@@ -1301,6 +1313,29 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent
}
}
/**
* Returns a new NetworkStats object where entries are transformed.
*
* Note that because NetworkStats is more akin to a map than to a list,
* the entries will be grouped after they are mapped by the key fields,
* e.g. uid, set, tag, defaultNetwork.
* Value fields with the same keys will be added together.
*/
@NonNull
private NetworkStats map(@NonNull Function<Entry, Entry> f) {
final NetworkStats ret = new NetworkStats(0, 1);
for (Entry e : this) {
final NetworkStats.Entry transformed = f.apply(e);
if (transformed == e) {
throw new IllegalStateException("A new entry must be created.");
}
transformed.setValues(e.getRxBytes(), e.getRxPackets(), e.getTxBytes(),
e.getTxPackets(), e.getOperations());
ret.combineValues(transformed);
}
return ret;
}
/**
* Only keep entries that match all specified filters.
*