diff options
| author | chirantan <chirantan@chromium.org> | 2014-08-26 15:53:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 22:57:19 +0000 |
| commit | 711a45960ad918dbc2f7fbbeeda0f19079c674a6 (patch) | |
| tree | bb623a7099e57e950d88f7275fd93b3c1c1a437f | |
| parent | c4a3f88c4434e86057a8c7ae4e109b8be4138d8f (diff) | |
| download | chromium_src-711a45960ad918dbc2f7fbbeeda0f19079c674a6.zip chromium_src-711a45960ad918dbc2f7fbbeeda0f19079c674a6.tar.gz chromium_src-711a45960ad918dbc2f7fbbeeda0f19079c674a6.tar.bz2 | |
chromeos: Clear suspend state information if powerd restarts
Clear internal state information about a pending suspend attempt when
the power manager restarts to prevent chrome from sending bogus messages
to the new power manager.
BUG=none
Signed-off-by: Chirantan Ekbote <chirantan@chromium.org>
Review URL: https://codereview.chromium.org/507803002
Cr-Commit-Position: refs/heads/master@{#292015}
| -rw-r--r-- | chromeos/dbus/power_manager_client.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc index 56efcf1..45cce50 100644 --- a/chromeos/dbus/power_manager_client.cc +++ b/chromeos/dbus/power_manager_client.cc @@ -347,6 +347,9 @@ class PowerManagerClientImpl : public PowerManagerClient { << (old_owner.empty() ? "[none]" : old_owner.c_str()) << ", new owner is " << (new_owner.empty() ? "[none]" : new_owner.c_str()) << ")"; + suspend_is_pending_ = false; + pending_suspend_id_ = -1; + suspending_from_dark_resume_ = false; if (!new_owner.empty()) { VLOG(1) << "Sending initial state to power manager"; RegisterSuspendDelays(); |