diff options
| author | Samuel Holland <samuel.holland@sifive.com> | 2024-02-13 00:01:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-13 00:01:37 +0000 |
| commit | e4cc0b2b66d2352162c74ca347835a11d0f75a04 (patch) | |
| tree | 95199c2cb5290fc5b3924ebd9bb62ef6cc717e48 | |
| parent | b714eda048aad4d7b64443e167a01cb6c4cb54ad (diff) | |
| parent | 4a09f65b86c6520195403b7fb52f5b6d255f6227 (diff) | |
| download | netd-e4cc0b2b66d2352162c74ca347835a11d0f75a04.tar.gz | |
Respect HwTimeoutMultiplier in IptablesRestoreController am: 4a09f65b86
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2769114
Change-Id: If4aa1d389f9561d27a643b722979d5e8f0adc71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | server/IptablesRestoreController.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp index dc718309..d0aaa638 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 @@ constexpr size_t PING_SIZE = sizeof(PING) - 1; // 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: |