Merge "Avoid key_queue_mutex deadlock in waitkey()"
This commit is contained in:
commit
eb33356544
1 changed files with 3 additions and 3 deletions
|
@ -419,7 +419,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
|
||||||
LOG(INFO) << "Brightness: " << brightness_normal_value_ << " (" << brightness_normal_
|
LOG(INFO) << "Brightness: " << brightness_normal_value_ << " (" << brightness_normal_
|
||||||
<< "%)";
|
<< "%)";
|
||||||
} else {
|
} else {
|
||||||
LOG(ERROR) << "Unable to set brightness to normal";
|
LOG(WARNING) << "Unable to set brightness to normal";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ScreensaverState::DIMMED:
|
case ScreensaverState::DIMMED:
|
||||||
|
@ -429,7 +429,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
|
||||||
<< "%)";
|
<< "%)";
|
||||||
screensaver_state_ = ScreensaverState::DIMMED;
|
screensaver_state_ = ScreensaverState::DIMMED;
|
||||||
} else {
|
} else {
|
||||||
LOG(ERROR) << "Unable to set brightness to dim";
|
LOG(WARNING) << "Unable to set brightness to dim";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ScreensaverState::OFF:
|
case ScreensaverState::OFF:
|
||||||
|
@ -437,7 +437,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
|
||||||
LOG(INFO) << "Brightness: 0 (off)";
|
LOG(INFO) << "Brightness: 0 (off)";
|
||||||
screensaver_state_ = ScreensaverState::OFF;
|
screensaver_state_ = ScreensaverState::OFF;
|
||||||
} else {
|
} else {
|
||||||
LOG(ERROR) << "Unable to set brightness to off";
|
LOG(WARNING) << "Unable to set brightness to off";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue