commit ba79e86815f733c03e9db21a4190ab889dfb8cb5
author Alessandro Astone <ales.astone@gmail.com> Wed Feb 26 17:25:54 2020 +0100
committer Tim Zimmermann <tim@linux4.de> Tue Mar 05 06:10:01 2024 +0100
tree f3ae26d658ac8c4855233986489b59a0b9df8c7e
parent 533439af4232ae177cf740c616251ed377dc74b0

recovery: allow opting-in to fastbootd

Change-Id: Id8228c0782f4520779d3a2116ea11015b64c13c3

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index a74eb44..a46bfdb 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -380,7 +380,8 @@
         } else if (option == "reason") {
           reason = optarg;
         } else if (option == "fastboot" &&
-                   android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
+                   (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) ||
+                    android::base::GetBoolProperty("ro.fastbootd.available", false))) {
           fastboot = true;
         }
         break;
@@ -444,7 +445,8 @@
     device->RemoveMenuItemForAction(Device::WIPE_CACHE);
   }
 
-  if (!android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
+  if (!android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) &&
+      !android::base::GetBoolProperty("ro.fastbootd.available", false)) {
     device->RemoveMenuItemForAction(Device::ENTER_FASTBOOT);
   }
 

recovery_ui/screen_ui.cpp

diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp
index 58c50d1..13f6213 100644
--- a/recovery_ui/screen_ui.cpp
+++ b/recovery_ui/screen_ui.cpp
@@ -949,7 +949,8 @@
   no_command_text_ = LoadLocalizedBitmap("no_command_text");
   error_text_ = LoadLocalizedBitmap("error_text");
 
-  if (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
+  if (android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) ||
+      android::base::GetBoolProperty("ro.fastbootd.available", false)) {
     fastbootd_logo_ = LoadBitmap("fastbootd");
   }