Merge "Make timeout messages distinct" into main am: 1b251d441e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3160376
Change-Id: I244ec415204d140ee8b2a7b2921898498f0ef182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/client/debuggerd_client.cpp b/debuggerd/client/debuggerd_client.cpp
index af1bb81..632f6f1 100644
--- a/debuggerd/client/debuggerd_client.cpp
+++ b/debuggerd/client/debuggerd_client.cpp
@@ -138,7 +138,7 @@
auto remaining = end - std::chrono::steady_clock::now();
if (remaining < decltype(remaining)::zero()) {
- log_error(output_fd, 0, "timeout expired");
+ log_error(output_fd, 0, "timeout expired (update_timeout)");
return false;
}
@@ -254,7 +254,7 @@
if (timeout_ms <= 0) {
remaining_ms = -1;
} else if (remaining_ms < 0) {
- log_error(output_fd, 0, "timeout expired");
+ log_error(output_fd, 0, "timeout expired before poll");
return false;
}
@@ -271,7 +271,7 @@
return false;
}
} else if (rc == 0) {
- log_error(output_fd, 0, "timeout expired");
+ log_error(output_fd, 0, "poll timeout expired");
return false;
}