summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-08-17 07:14:51 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-08-17 07:14:51 +0200
commit3c2b399820226a7d640d35a7206add9733fa6ae5 (patch)
tree631777a56e503682c09ab39da0b2b3f8bd145255
parentMerge "updater: Add SourceInfo::{ReadAll,DumpBuffer,Overlaps}." am: d460afe963 am: 559d01ff16 (diff)
parentMerge "ui: Only set brightness when needed." am: cf01f7dcbe (diff)
downloadandroid_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar.gz
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar.bz2
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar.lz
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar.xz
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.tar.zst
android_bootable_recovery-3c2b399820226a7d640d35a7206add9733fa6ae5.zip
-rw-r--r--ui.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/ui.cpp b/ui.cpp
index f1e30f500..14b5b0941 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -454,8 +454,7 @@ int RecoveryUI::WaitKey() {
return static_cast<int>(KeyError::INTERRUPTED);
}
- // Time out after UI_WAIT_KEY_TIMEOUT_SEC, unless a USB cable is
- // plugged in.
+ // Time out after UI_WAIT_KEY_TIMEOUT_SEC, unless a USB cable is plugged in.
do {
bool rc = key_queue_cond.wait_for(lk, std::chrono::seconds(UI_WAIT_KEY_TIMEOUT_SEC), [this] {
return this->key_queue_len != 0 || key_interrupted_;
@@ -466,13 +465,13 @@ int RecoveryUI::WaitKey() {
}
if (screensaver_state_ != ScreensaverState::DISABLED) {
if (!rc) {
- // Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF.
+ // Must be after a timeout. Lower the brightness level: NORMAL -> DIMMED; DIMMED -> OFF.
if (screensaver_state_ == ScreensaverState::NORMAL) {
SetScreensaverState(ScreensaverState::DIMMED);
} else if (screensaver_state_ == ScreensaverState::DIMMED) {
SetScreensaverState(ScreensaverState::OFF);
}
- } else {
+ } else if (screensaver_state_ != ScreensaverState::NORMAL) {
// Drop the first key if it's changing from OFF to NORMAL.
if (screensaver_state_ == ScreensaverState::OFF) {
if (key_queue_len > 0) {