Move app uid stats map dump to NetworkStatsService
Map status dump will do access check if map is null.
This could show different message from the current dump output.
Information in map content dump does not change
$ dumpsys connectivity trafficcontroller
....
mAppUidStatsMap::
uid rxBytes rxPackets txBytes txPackets
0 135 1 3602 47
1001 2414 8 385 6
1021 76 1 76 1
1000 290 2 260 3
....
$ dumpsys netstats
....
mAppUidStatsMap:
uid rxBytes rxPackets txBytes txPackets
0 135 1 3602 47
1001 2414 8 385 6
1021 76 1 76 1
1000 290 2 260 3
....
Bug: 217624062
Test: dumpsys netstats, dumpstate, atest NetworkStatsServiceTest
Change-Id: I71988117c6dc3033f710b26a15d15879b35d50a4
This commit is contained in:
@@ -791,9 +791,6 @@ TEST_F(TrafficControllerTest, TestDumpsys) {
|
||||
// ifaceIndex ifaceName tag_hex uid_int cnt_set rxBytes rxPackets txBytes txPackets
|
||||
// 999 test0 0x2a 10086 1 100 1 0 0
|
||||
std::vector<std::string> expectedLines = {
|
||||
"mAppUidStatsMap::", // TODO@: fix double colon
|
||||
"uid rxBytes rxPackets txBytes txPackets",
|
||||
fmt::format("{} {} {} {} {}", TEST_UID, RXBYTES, RXPACKETS, TXBYTES, TXPACKETS),
|
||||
"mStatsMapA",
|
||||
"ifaceIndex ifaceName tag_hex uid_int cnt_set rxBytes rxPackets txBytes txPackets",
|
||||
fmt::format("{} {} {:#x} {} {} {} {} {} {}",
|
||||
@@ -829,7 +826,6 @@ TEST_F(TrafficControllerTest, dumpsysInvalidMaps) {
|
||||
"Read value of map -1 failed: Bad file descriptor";
|
||||
|
||||
std::vector<std::string> expectedLines = {
|
||||
fmt::format("mAppUidStatsMap {}", kErrIterate),
|
||||
fmt::format("mStatsMapA {}", kErrIterate),
|
||||
fmt::format("mStatsMapB {}", kErrIterate),
|
||||
fmt::format("mIfaceIndexNameMap {}", kErrIterate),
|
||||
|
||||
Reference in New Issue
Block a user