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

Make getProviderIfaceStats return Entry

Browse source 
This refactoring makes the method return Entry for follow-up
changes to perform arithmetic operations on them easily.
This change also removes error handling when the type is
unsupported when calling getProviderIfaceStats because it
cannot happen in practice.

Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Bug: N/A
Change-Id: Id26a24c80bb87c399972ef8c3abf16e0f4719cb1
This commit is contained in:
Junyu Lai 2024-01-03 14:53:08 +08:00
commit d2e3b8d699
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1987,15 +1987,17 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override
public long getIfaceStats(@NonNull String iface, int type) {
Objects.requireNonNull(iface);
long nativeIfaceStats = getEntryValueForType(nativeGetIfaceStat(iface), type);
if (nativeIfaceStats == UNSUPPORTED) {
return nativeIfaceStats;
final NetworkStats.Entry entry = nativeGetIfaceStat(iface);
final long value = getEntryValueForType(entry, type);
if (value == UNSUPPORTED) {
return UNSUPPORTED;
} else {
// When tethering offload is in use, nativeIfaceStats does not contain usage from
// offload, add it back here. Note that the included statistics might be stale
// since polling newest stats from hardware might impact system health and not
// suitable for TrafficStats API use cases.
return nativeIfaceStats + getProviderIfaceStats(iface, type);
entry.add(getProviderIfaceStats(iface));
return getEntryValueForType(entry, type);
}
}
@ -2017,16 +2019,18 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override
public long getTotalStats(int type) {
final long nativeTotalStats = getEntryValueForType(nativeGetTotalStat(), type);
if (nativeTotalStats == UNSUPPORTED) {
return nativeTotalStats;
final NetworkStats.Entry entry = nativeGetTotalStat();
final long value = getEntryValueForType(entry, type);
if (value == UNSUPPORTED) {
return UNSUPPORTED;
} else {
// Refer to comment in getIfaceStats
return nativeTotalStats + getProviderIfaceStats(IFACE_ALL, type);
entry.add(getProviderIfaceStats(IFACE_ALL));
return getEntryValueForType(entry, type);
}
}
private long getProviderIfaceStats(@Nullable String iface, int type) {
private NetworkStats.Entry getProviderIfaceStats(@Nullable String iface) {
final NetworkStats providerSnapshot = getNetworkStatsFromProviders(STATS_PER_IFACE);
final HashSet<String> limitIfaces;
if (iface == IFACE_ALL) {
@ -2035,19 +2039,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
limitIfaces = new HashSet<>();
limitIfaces.add(iface);
}
final NetworkStats.Entry entry = providerSnapshot.getTotal(null, limitIfaces);
switch (type) {
case TrafficStats.TYPE_RX_BYTES:
return entry.rxBytes;
case TrafficStats.TYPE_RX_PACKETS:
return entry.rxPackets;
case TrafficStats.TYPE_TX_BYTES:
return entry.txBytes;
case TrafficStats.TYPE_TX_PACKETS:
return entry.txPackets;
default:
return 0;
}
return providerSnapshot.getTotal(null, limitIfaces);
}
/**