Commit 7c3c3e50 authored by derat's avatar derat Committed by Commit bot

chromeos: Avoid a startup crash when powerd isn't running.

Introduced by r290692.

BUG=406968

Review URL: https://codereview.chromium.org/470803008

Cr-Commit-Position: refs/heads/master@{#291725}
parent ec922586
...@@ -438,16 +438,17 @@ class PowerManagerClientImpl : public PowerManagerClient { ...@@ -438,16 +438,17 @@ class PowerManagerClientImpl : public PowerManagerClient {
} }
void HandleRegisterSuspendDelayReply(bool dark_suspend, void HandleRegisterSuspendDelayReply(bool dark_suspend,
const std::string& method_name,
dbus::Response* response) { dbus::Response* response) {
if (!response) { if (!response) {
LOG(ERROR) << "Error calling " << response->GetMember(); LOG(ERROR) << "Error calling " << method_name;
return; return;
} }
dbus::MessageReader reader(response); dbus::MessageReader reader(response);
power_manager::RegisterSuspendDelayReply protobuf; power_manager::RegisterSuspendDelayReply protobuf;
if (!reader.PopArrayOfBytesAsProto(&protobuf)) { if (!reader.PopArrayOfBytesAsProto(&protobuf)) {
LOG(ERROR) << "Unable to parse reply from " << response->GetMember(); LOG(ERROR) << "Unable to parse reply from " << method_name;
return; return;
} }
...@@ -619,15 +620,15 @@ class PowerManagerClientImpl : public PowerManagerClient { ...@@ -619,15 +620,15 @@ class PowerManagerClientImpl : public PowerManagerClient {
RegisterSuspendDelayImpl( RegisterSuspendDelayImpl(
power_manager::kRegisterSuspendDelayMethod, power_manager::kRegisterSuspendDelayMethod,
protobuf_request, protobuf_request,
base::Bind( base::Bind(&PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
&PowerManagerClientImpl::HandleRegisterSuspendDelayReply, weak_ptr_factory_.GetWeakPtr(), false,
weak_ptr_factory_.GetWeakPtr(), false)); power_manager::kRegisterSuspendDelayMethod));
RegisterSuspendDelayImpl( RegisterSuspendDelayImpl(
power_manager::kRegisterDarkSuspendDelayMethod, power_manager::kRegisterDarkSuspendDelayMethod,
protobuf_request, protobuf_request,
base::Bind( base::Bind(&PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
&PowerManagerClientImpl::HandleRegisterSuspendDelayReply, weak_ptr_factory_.GetWeakPtr(), true,
weak_ptr_factory_.GetWeakPtr(), true)); power_manager::kRegisterDarkSuspendDelayMethod));
} }
// Records the fact that an observer has finished doing asynchronous work // Records the fact that an observer has finished doing asynchronous work
......
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