commit 9a65ac6a69575ed7c20d30faa2f74839c4ec2aed
author Lorenzo Colitti <lorenzo@google.com> Mon Sep 04 18:07:56 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Sep 05 12:50:42 2017 +0900
tree 5a6bc13365e312553f7a92d845088ad213e641e9
parent 5192bf770acad258e24bfcf8984e16734a2839dd

Swap TX and RX in addForwardChainStats for clarity.

Bug: 32163131
Bug: 64995262
Test: netd_{unit,integration}_test pass
Test: tethering data usage UI reflects actual data usage
Change-Id: Icf5b66972d91e9e45e40d7b4989a15f970a78461

server/TetherControllerTest.cpp

diff --git a/server/TetherControllerTest.cpp b/server/TetherControllerTest.cpp
index 5043d12..362af2f 100644
--- a/server/TetherControllerTest.cpp
+++ b/server/TetherControllerTest.cpp
@@ -245,8 +245,8 @@
 
     // IPv4 and IPv6 counters are properly added together.
     addIptablesRestoreOutput(kIPv4TetherCounters, kIPv6TetherCounters);
-    TetherStats expected0("wlan0", "rmnet0", 10002373, 10026, 20002002, 20027);
-    TetherStats expected1("bt-pan", "rmnet0", 107471, 1040, 1708806, 1450);
+    TetherStats expected0("wlan0", "rmnet0", 20002002, 20027, 10002373, 10026);
+    TetherStats expected1("bt-pan", "rmnet0", 1708806, 1450, 107471, 1040);
     StatusOr<TetherStatsList> result = mTetherCtrl.getTetherStats();
     ASSERT_TRUE(isOk(result));
     TetherStatsList actual = result.value();
@@ -270,7 +270,7 @@
     counterLines.resize(4);
     std::string counters = Join(counterLines, "\n") + "\n";
     addIptablesRestoreOutput(counters, counters);
-    TetherStats expected1_0("wlan0", "rmnet0", 4746, 52, 4004, 54);
+    TetherStats expected1_0("wlan0", "rmnet0", 4004, 54, 4746, 52);
     result = mTetherCtrl.getTetherStats();
     ASSERT_TRUE(isOk(result));
     actual = result.value();