| Index: ash/system/chromeos/power/tablet_power_button_controller.cc
|
| diff --git a/ash/system/chromeos/power/tablet_power_button_controller.cc b/ash/system/chromeos/power/tablet_power_button_controller.cc
|
| index 06d9efae2292990d999ea471bae6c94bf3424912..bd52b98a83a518168425597b1184b32e571aa33d 100644
|
| --- a/ash/system/chromeos/power/tablet_power_button_controller.cc
|
| +++ b/ash/system/chromeos/power/tablet_power_button_controller.cc
|
| @@ -98,6 +98,10 @@ void TabletPowerButtonController::OnPowerButtonEvent(
|
| // don't turn the screen off in response to the events.
|
| if (timestamp - last_resume_time_ <=
|
| base::TimeDelta::FromMilliseconds(kIgnorePowerButtonAfterResumeMs)) {
|
| + // If backlights are forced off, stop forcing off because resuming system
|
| + // doesn't handle this.
|
| + if (down && backlights_forced_off_)
|
| + SetBacklightsForcedOff(false);
|
| return;
|
| }
|
|
|
|
|