diff options
| -rw-r--r-- | recovery_ui/include/recovery_ui/ui.h | 2 | ||||
| -rw-r--r-- | recovery_ui/ui.cpp | 2 | ||||
| -rw-r--r-- | updater/target_files.cpp | 2 |
3 files changed, 2 insertions, 4 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; } diff --git a/updater/target_files.cpp b/updater/target_files.cpp index 2789683b1..919ec4e04 100644 --- a/updater/target_files.cpp +++ b/updater/target_files.cpp @@ -201,7 +201,7 @@ bool TargetFile::GetBuildProps(std::map<std::string, std::string, std::less<>>* "SYSTEM_EXT/build.prop", "SYSTEM/vendor/build.prop", "SYSTEM/product/build.prop", - "SYSTEM/ext/build.prop", + "SYSTEM/system_ext/build.prop", "ODM/build.prop", // legacy "ODM/etc/build.prop", "VENDOR/odm/build.prop", // legacy |