commit 728cf4c9953c997fab2c820755f1157d7712dd2a
author Luke Huang <huangluke@google.com> Thu Mar 14 19:43:02 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Mar 15 05:47:12 2019 +0000
tree 7281037df71f1b12ff3823b5f8c446c43b3ffca3
parent b257d61cd55c00a50d1eaaf4e7fcf436185c9a2c

refine test TestIpfwdEnableDisableStatusForwarding and some minor changes on test

1. fix flaky test for TestIpfwdEnableDisableStatusForwarding
2. fix time unit error in binder_test, set retry default
   interval as 50ms
3. refine naming in binder_test

Bug: 128533612
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass

Change-Id: Ia03d0c30b49cdd233b627cce8bd2f3f05548798e

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 7728e0e..1b537eb 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -886,7 +886,15 @@
 
 binder::Status NetdNativeService::ipfwdEnabled(bool* status) {
     NETD_LOCKING_RPC(gCtls->tetherCtrl.lock, PERM_NETWORK_STACK, PERM_MAINLINE_NETWORK_STACK);
-    *status = (gCtls->tetherCtrl.forwardingRequestCount() > 0) ? true : false;
+    *status = (gCtls->tetherCtrl.getIpfwdRequesterList().size() > 0) ? true : false;
+    return binder::Status::ok();
+}
+
+binder::Status NetdNativeService::ipfwdGetRequesterList(std::vector<std::string>* requesterList) {
+    NETD_LOCKING_RPC(gCtls->tetherCtrl.lock, PERM_NETWORK_STACK, PERM_MAINLINE_NETWORK_STACK);
+    for (const auto& requester : gCtls->tetherCtrl.getIpfwdRequesterList()) {
+        requesterList->push_back(requester);
+    }
     return binder::Status::ok();
 }