commit f2fed7647ede2ae39a76d50cf4abc9e57b49d40d
author Yusuke Sato <yusukes@google.com> Wed Aug 19 13:47:30 2015 -0700
committer Yusuke Sato <yusukes@google.com> Wed Aug 19 21:58:07 2015 -0700
tree 7cd59c5b96c34d1d2d60a00758a38b51e60d3504
parent f86df5580e86c2405c71c708408eeee57b38c0d3

Make iptables -L and -S calls wait for xtables lock

(cherry picked from commit 99b40503edccae74d0917b9d1e17a5939ac7193b)

Bug:22802665
Change-Id: Ief59212ab976af940887508fab706b5be07005c6

server/BandwidthController.cpp

diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index d656fe8..d71ce3b 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -1249,7 +1249,7 @@
      * the wanted info.
      */
     fullCmd = IPTABLES_PATH;
-    fullCmd += " -nvx -L ";
+    fullCmd += " -nvx -w -L ";
     fullCmd += NatController::LOCAL_TETHER_COUNTERS_CHAIN;
     iptOutput = popen(fullCmd.c_str(), "r");
     if (!iptOutput) {
@@ -1270,7 +1270,7 @@
 
     /* Only lookup ip4 table names as ip6 will have the same tables ... */
     fullCmd = IPTABLES_PATH;
-    fullCmd += " -S";
+    fullCmd += " -w -S";
     iptOutput = popen(fullCmd.c_str(), "r");
     if (!iptOutput) {
             ALOGE("Failed to run %s err=%s", fullCmd.c_str(), strerror(errno));