summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-07-10 01:38:29 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-07-10 01:38:29 +0200
commit4b6a9c52eaf1a197336f35db4e054d1fb5990064 (patch)
tree88fb4fb141ae521f297cb8866d9332a409e4f62d
parentMerge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 (diff)
parentMerge "recovery_ui: Remove RecoveryUI::last_key." (diff)
downloadandroid_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar.gz
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar.bz2
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar.lz
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar.xz
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.tar.zst
android_bootable_recovery-4b6a9c52eaf1a197336f35db4e054d1fb5990064.zip
-rw-r--r--recovery_ui/include/recovery_ui/ui.h2
-rw-r--r--recovery_ui/ui.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/recovery_ui/include/recovery_ui/ui.h b/recovery_ui/include/recovery_ui/ui.h
index 797e2f0d5..d2ebad25b 100644
--- a/recovery_ui/include/recovery_ui/ui.h
+++ b/recovery_ui/include/recovery_ui/ui.h
@@ -230,6 +230,7 @@ class RecoveryUI {
bool InitScreensaver();
void SetScreensaverState(ScreensaverState state);
+
// Key event input queue
std::mutex key_queue_mutex;
std::condition_variable key_queue_cond;
@@ -243,7 +244,6 @@ class RecoveryUI {
int rel_sum;
int consecutive_power_keys;
- int last_key;
bool has_power_key;
bool has_up_key;
diff --git a/recovery_ui/ui.cpp b/recovery_ui/ui.cpp
index cf0d3b563..1f1cd18b1 100644
--- a/recovery_ui/ui.cpp
+++ b/recovery_ui/ui.cpp
@@ -70,7 +70,6 @@ RecoveryUI::RecoveryUI()
key_down_count(0),
enable_reboot(true),
consecutive_power_keys(0),
- last_key(-1),
has_power_key(false),
has_up_key(false),
has_down_key(false),
@@ -585,7 +584,6 @@ RecoveryUI::KeyAction RecoveryUI::CheckKey(int key, bool is_long_press) {
consecutive_power_keys = 0;
}
- last_key = key;
return (IsTextVisible() || screensaver_state_ == ScreensaverState::OFF) ? ENQUEUE : IGNORE;
}