Merge "Avoid key_queue_mutex deadlock in waitkey()"

am: eb33356544

Change-Id: I77a49758aefeb521cab18aa66942fa80f6752135
This commit is contained in:
Zhang, GaofengX 2019-06-12 17:19:43 -07:00 committed by android-build-merger
commit 6a550f518e

View file

@ -419,7 +419,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
LOG(INFO) << "Brightness: " << brightness_normal_value_ << " (" << brightness_normal_
<< "%)";
} else {
LOG(ERROR) << "Unable to set brightness to normal";
LOG(WARNING) << "Unable to set brightness to normal";
}
break;
case ScreensaverState::DIMMED:
@ -429,7 +429,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
<< "%)";
screensaver_state_ = ScreensaverState::DIMMED;
} else {
LOG(ERROR) << "Unable to set brightness to dim";
LOG(WARNING) << "Unable to set brightness to dim";
}
break;
case ScreensaverState::OFF:
@ -437,7 +437,7 @@ void RecoveryUI::SetScreensaverState(ScreensaverState state) {
LOG(INFO) << "Brightness: 0 (off)";
screensaver_state_ = ScreensaverState::OFF;
} else {
LOG(ERROR) << "Unable to set brightness to off";
LOG(WARNING) << "Unable to set brightness to off";
}
break;
default: