Commit 93f66e0e authored by Fergus Dall's avatar Fergus Dall Committed by Commit Bot

Assume stoping vm_concierge succeeds if we get an empty response

Currently, we assume that debugd sends back a boolean success/fail
value in the response when asked to shutdown vm_concierge, but in fact
the response is empty, resulting in spurious error messages. This CL
changes this behaviour to assume success when receving any response,
including an empty one.

Bug: 900841
Change-Id: I04682973c6dc9d190d43c1626c9b4e05cfa35484
Reviewed-on: https://chromium-review.googlesource.com/c/1312140
Commit-Queue: Fergus Dall <sidereal@google.com>
Reviewed-by: default avatarRyo Hashimoto <hashimoto@chromium.org>
Reviewed-by: default avatarNicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606284}
parent ecac5a9e
...@@ -734,12 +734,9 @@ class DebugDaemonClientImpl : public DebugDaemonClient { ...@@ -734,12 +734,9 @@ class DebugDaemonClientImpl : public DebugDaemonClient {
} }
void OnStopConcierge(ConciergeCallback callback, dbus::Response* response) { void OnStopConcierge(ConciergeCallback callback, dbus::Response* response) {
bool result = false; // Debugd just sends back an empty response, so we just check if
dbus::MessageReader reader(response); // the response exists
if (response) { std::move(callback).Run(response != nullptr);
reader.PopBool(&result);
}
std::move(callback).Run(result);
} }
void OnSetRlzPingSent(SetRlzPingSentCallback callback, void OnSetRlzPingSent(SetRlzPingSentCallback callback,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment