commit | 93c9dbe115bc6b162d9eb708de1c847eb9f73be4 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 17 01:22:47 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 17 01:22:47 2022 +0000 |
tree | 03f3427987adb0bdd57bb6fb5ad1fdb2a69cfea0 | |
parent | 146112e6606427e6673bab1f55957f074824c245 [diff] | |
parent | 0777c5d6048eb2f36a4cd80a1dd4240ff71fae17 [diff] |
Merge "Use sleep_for for fsck timeout" am: 0777c5d604 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2311079 Change-Id: I007ddd743a88a629fac27f6bf8575957661de955 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Utils.cpp b/Utils.cpp index 7bf8019..33dbaf6 100644 --- a/Utils.cpp +++ b/Utils.cpp
@@ -766,7 +766,7 @@ } pid_t timer_pid = fork(); if (timer_pid == 0) { - sleep(timeout.count()); + std::this_thread::sleep_for(timeout); _exit(ETIMEDOUT); } if (timer_pid == -1) {