Merge changes from topic "TrafficStats.getTxRxBytes" am: 42fbb57b31 am: 3e5a3ed5d5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490181

Change-Id: I4489721fe75ccc8e89d954f911bbe9ffb27e590c
This commit is contained in:
Junyu Lai
2020-11-25 06:11:55 +00:00
committed by Automerger Merge Worker

View File

@@ -254,13 +254,13 @@ public class TrafficStatsTest extends AndroidTestCase {
assertInRange("uidrxb", uidRxDeltaBytes, pktBytes + minExpExtraPktBytes,
pktBytes + pktWithNoDataBytes + maxExpExtraPktBytes + deltaRxOtherPktBytes);
assertInRange("iftxp", ifaceTxDeltaPackets, packetCount + minExpectedExtraPackets,
packetCount + packetCount + maxExpectedExtraPackets + deltaTxOtherPackets);
packetCount + packetCount + maxExpectedExtraPackets);
assertInRange("ifrxp", ifaceRxDeltaPackets, packetCount + minExpectedExtraPackets,
packetCount + packetCount + maxExpectedExtraPackets + deltaRxOtherPackets);
packetCount + packetCount + maxExpectedExtraPackets);
assertInRange("iftxb", ifaceTxDeltaBytes, pktBytes + minExpExtraPktBytes,
pktBytes + pktWithNoDataBytes + maxExpExtraPktBytes + deltaTxOtherPktBytes);
pktBytes + pktWithNoDataBytes + maxExpExtraPktBytes);
assertInRange("ifrxb", ifaceRxDeltaBytes, pktBytes + minExpExtraPktBytes,
pktBytes + pktWithNoDataBytes + maxExpExtraPktBytes + deltaRxOtherPktBytes);
pktBytes + pktWithNoDataBytes + maxExpExtraPktBytes);
// Localhost traffic *does* count against total stats.
// Check the total stats increased after test data transfer over localhost has been made.