commit 6ccf3a732cfd0bc9fb232d4e80a59f3ba051a960
author Tao Bao <tbao@google.com> Tue Jul 09 17:43:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 09 17:43:57 2019 -0700
tree bf0b3e8a931fa13cc7a7ec8ac2bf9224aba46cef
parent 5d3b4fbba6e2cfc86d8eae817b806e35ebdaa886
parent dd23db94127d6416e64064f0ca1c00e847fc270c

Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d am: 4324e07a29 am: 4b6a9c52ea
am: dd23db9412

Change-Id: I559d88aae69df32ce7a0479e07cfa32dbfdf57c4

recovery_ui/include/recovery_ui/ui.h

diff --git a/recovery_ui/include/recovery_ui/ui.h b/recovery_ui/include/recovery_ui/ui.h
index 797e2f0..d2ebad2 100644
--- a/recovery_ui/include/recovery_ui/ui.h
+++ b/recovery_ui/include/recovery_ui/ui.h
@@ -230,6 +230,7 @@
 
   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 @@
   int rel_sum;
 
   int consecutive_power_keys;
-  int last_key;
 
   bool has_power_key;
   bool has_up_key;

recovery_ui/ui.cpp

diff --git a/recovery_ui/ui.cpp b/recovery_ui/ui.cpp
index cf0d3b5..1f1cd18 100644
--- a/recovery_ui/ui.cpp
+++ b/recovery_ui/ui.cpp
@@ -70,7 +70,6 @@
       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 @@
     consecutive_power_keys = 0;
   }
 
-  last_key = key;
   return (IsTextVisible() || screensaver_state_ == ScreensaverState::OFF) ? ENQUEUE : IGNORE;
 }