Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e am: 7d453edf34

am: 90ced9877c

Change-Id: I5f8b6cc3f4801f14dfc45b15fdc2d10b05b1a2fe
This commit is contained in:
Zhang, GaofengX
2019-06-12 18:01:16 -07:00
committed by android-build-merger
+3 -3
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: