PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d

Browse Source 
am: 4324e07a29

Change-Id: Ia14ad137f562e59cfd22c5665598e1dbef1b8a87
This commit is contained in:
Tao Bao
2019-07-09 16:38:29 -07:00
committed by android-build-merger
parent fe0737868b 4324e07a29
commit 4b6a9c52ea
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery_ui/include/recovery_ui/ui.h
+1 -1
View File
@@ -230,6 +230,7 @@ class RecoveryUI {
bool InitScreensaver(); bool InitScreensaver();
void SetScreensaverState(ScreensaverState state); void SetScreensaverState(ScreensaverState state);
// Key event input queue // Key event input queue
std::mutex key_queue_mutex; std::mutex key_queue_mutex;
std::condition_variable key_queue_cond; std::condition_variable key_queue_cond;
@@ -243,7 +244,6 @@ class RecoveryUI {
int rel_sum; int rel_sum;
int consecutive_power_keys; int consecutive_power_keys;
int last_key;
bool has_power_key; bool has_power_key;
bool has_up_key; bool has_up_key;
recovery_ui/ui.cpp
-2
View File
@@ -70,7 +70,6 @@ RecoveryUI::RecoveryUI()
key_down_count(0), key_down_count(0),
enable_reboot(true), enable_reboot(true),
consecutive_power_keys(0), consecutive_power_keys(0),
last_key(-1),
has_power_key(false), has_power_key(false),
has_up_key(false), has_up_key(false),
has_down_key(false), has_down_key(false),
@@ -585,7 +584,6 @@ RecoveryUI::KeyAction RecoveryUI::CheckKey(int key, bool is_long_press) {
consecutive_power_keys = 0; consecutive_power_keys = 0;
} }
last_key = key;
return (IsTextVisible() || screensaver_state_ == ScreensaverState::OFF) ? ENQUEUE : IGNORE; return (IsTextVisible() || screensaver_state_ == ScreensaverState::OFF) ? ENQUEUE : IGNORE;
} }