commit caebcbb1319c9cc0915b9f186ba6689c0c674486
author Luke Huang <huangluke@google.com> Thu Sep 27 20:37:14 2018 +0800
committer Luke Huang <huangluke@google.com> Thu Oct 11 02:53:22 2018 +0000
tree 98675f8efe44db791a1aa239f741268d109fda8b
parent 4eb6ecf3cc61ded1e8237778548c3f3a991d05be

Refactor tetherGetStats by using stable aidl structure

Use stable aidl structure instead of persistbundle

Test: built, flashed, booted
      system/netd/tests/runtests.sh passes

Change-Id: Id48cea4da4f9f4406ceb3d2281a5cfaaea8ce24f

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 3f77a76..1014cf9 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -77,10 +77,10 @@
 using android::base::Trim;
 using android::bpf::hasBpfSupport;
 using android::net::INetd;
+using android::net::TetherStatsParcel;
 using android::net::TunInterface;
 using android::net::UidRange;
 using android::net::XfrmController;
-using android::os::PersistableBundle;
 
 #define SKIP_IF_BPF_SUPPORTED        \
     do {                             \
@@ -1028,6 +1028,16 @@
                             path, if2.c_str(), if1.c_str()));
 }
 
+std::vector<int64_t> getStatsVectorByIf(const std::vector<TetherStatsParcel>& statsVec,
+                                        const std::string& iface) {
+    for (auto& stats : statsVec) {
+        if (stats.iface == iface) {
+            return {stats.rxBytes, stats.rxPackets, stats.txBytes, stats.txPackets};
+        }
+    }
+    return {};
+}
+
 }  // namespace
 
 TEST_F(BinderTest, TetherGetStats) {
@@ -1063,17 +1073,13 @@
     addTetherCounterValues(IP6TABLES_PATH, extIface2, intIface3, 2000,  35);
     std::vector<int64_t> expected2 = { 8000, 519, 5000, 388 };
 
-    PersistableBundle stats;
-    binder::Status status = mNetd->tetherGetStats(&stats);
+    std::vector<TetherStatsParcel> statsVec;
+    binder::Status status = mNetd->tetherGetStats(&statsVec);
     EXPECT_TRUE(status.isOk()) << "Getting tethering stats failed: " << status;
 
-    std::vector<int64_t> actual1;
-    EXPECT_TRUE(stats.getLongVector(String16(extIface1.c_str()), &actual1));
-    EXPECT_EQ(expected1, actual1);
+    EXPECT_EQ(expected1, getStatsVectorByIf(statsVec, extIface1));
 
-    std::vector<int64_t> actual2;
-    EXPECT_TRUE(stats.getLongVector(String16(extIface2.c_str()), &actual2));
-    EXPECT_EQ(expected2, actual2);
+    EXPECT_EQ(expected2, getStatsVectorByIf(statsVec, extIface2));
 
     for (const auto& path : { IPTABLES_PATH, IP6TABLES_PATH }) {
         delTetherCounterValues(path, intIface1, extIface1);