commit 5f408dd48a6ed4887d1c5e623ab7b702a6435137
author Tianjie Xu <xunchang@google.com> Wed Jul 10 17:40:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 10 17:40:37 2019 +0000
tree e54980f253f5b28db706f1d3dc4a2086acc40212
parent c992962503f9cb65ac55034774bacc72a5db102d
parent e5218615084c3bb4f12c91d0ebed823927f1bc68

Merge "Create a fallback to install from fuse if mmap fails"

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;
 }
 

updater/target_files.cpp

diff --git a/updater/target_files.cpp b/updater/target_files.cpp
index 2789683..919ec4e 100644
--- a/updater/target_files.cpp
+++ b/updater/target_files.cpp
@@ -201,7 +201,7 @@
     "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