commit da1675f4e78b30f35861a83c29b59505fbfb462e
author Alessandro Astone <ales.astone@gmail.com> Wed Feb 26 17:25:54 2020 +0100
committer Tim Zimmermann <tim@linux4.de> Tue Aug 23 17:55:22 2022 +0200
tree ba36301c0587380774ca89453285ce64a90c4dd5
parent 499ea4ef019faf22efef6c27703d2c133342b8a3

recovery: allow opting-in to fastbootd

Change-Id: Id8228c0782f4520779d3a2116ea11015b64c13c3

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index a7dbcfe..7fda281 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -405,7 +405,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;
@@ -469,7 +470,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);
   }