diff --git a/bpf_progs/netd.h b/bpf_progs/netd.h index be604f9a1a..1326db03d3 100644 --- a/bpf_progs/netd.h +++ b/bpf_progs/netd.h @@ -65,8 +65,6 @@ typedef struct { uint64_t rxPackets; uint64_t txBytes; uint64_t txPackets; - uint64_t tcpRxPackets; - uint64_t tcpTxPackets; } Stats; typedef struct { diff --git a/service-t/jni/com_android_server_net_NetworkStatsService.cpp b/service-t/jni/com_android_server_net_NetworkStatsService.cpp index 8d8dc3236f..ae553f0e59 100644 --- a/service-t/jni/com_android_server_net_NetworkStatsService.cpp +++ b/service-t/jni/com_android_server_net_NetworkStatsService.cpp @@ -47,8 +47,8 @@ enum StatsType { RX_PACKETS = 1, TX_BYTES = 2, TX_PACKETS = 3, - TCP_RX_PACKETS = 4, - TCP_TX_PACKETS = 5 + TCP_RX_PACKETS = 4, // not supported, always returns UNKNOWN (-1) + TCP_TX_PACKETS = 5, // not supported, always returns UNKNOWN (-1) }; static uint64_t getStatsType(Stats* stats, StatsType type) { @@ -62,9 +62,7 @@ static uint64_t getStatsType(Stats* stats, StatsType type) { case TX_PACKETS: return stats->txPackets; case TCP_RX_PACKETS: - return stats->tcpRxPackets; case TCP_TX_PACKETS: - return stats->tcpTxPackets; default: return UNKNOWN; } diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp index 2e6e3e5f71..317c3f9f10 100644 --- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp +++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp @@ -46,8 +46,6 @@ void InitStats(Stats* stats) { stats->rxPackets = 0; stats->txBytes = 0; stats->txPackets = 0; - stats->tcpRxPackets = -1; - stats->tcpTxPackets = -1; } int bpfGetUidStatsInternal(uid_t uid, Stats* stats,