diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-19 05:08:29 +0200 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-19 05:08:29 +0200 |
commit | a2a94cf00c4ff9267098d77b7fccaf703c3497d3 (patch) | |
tree | 0de6a79ad32aace6b7ceff14f85936bc3ce8c383 /ui.cpp | |
parent | Snap for 4957512 from a89dd7aeacf1e6587813c6c9f5bc6964d78393bc to qt-release (diff) | |
parent | Merge "updater: Add TransferList class." am: 102d14d6d1 am: 5cf27834f3 (diff) | |
download | android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar.gz android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar.bz2 android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar.lz android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar.xz android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.tar.zst android_bootable_recovery-a2a94cf00c4ff9267098d77b7fccaf703c3497d3.zip |
Diffstat (limited to 'ui.cpp')
-rw-r--r-- | ui.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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) { |