Respect HwTimeoutMultiplier in IptablesRestoreController
On slow hardware, iptables calls may take longer than 5 seconds.
Provide a way to increase the timeout in these scenarios.
Change-Id: I759f6de705fa81ccaa910738869f69875d88b4ca
diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp
index dc71830..d0aaa63 100644
--- a/server/IptablesRestoreController.cpp
+++ b/server/IptablesRestoreController.cpp
@@ -22,8 +22,9 @@
#include <sys/wait.h>
#include <unistd.h>
-#include <android-base/logging.h>
#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/properties.h>
#include <netdutils/Syscalls.h>
#include "Controllers.h"
@@ -41,7 +42,7 @@
// Not compile-time constants because they are changed by the unit tests.
int IptablesRestoreController::MAX_RETRIES = 50;
-int IptablesRestoreController::POLL_TIMEOUT_MS = 100;
+int IptablesRestoreController::POLL_TIMEOUT_MS = 100 * android::base::HwTimeoutMultiplier();
class IptablesProcess {
public:
