commit 2effe7761304a6762042bbedfff7235d0020500c
author Alessandro Astone <ales.astone@gmail.com> Wed Feb 26 17:25:54 2020 +0100
committer Łukasz Patron <priv.luk@gmail.com> Sat Mar 07 14:05:19 2020 +0100
tree 2e09baf1de4370904c62ffe440207314df4e2a1a
parent a72b2dc75d86485984a44099c592872325a059f5

recovery: allow opting-in to fastbootd

Change-Id: Id8228c0782f4520779d3a2116ea11015b64c13c3

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index fd0753c..454f952 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -385,7 +385,8 @@
         if (option == "locale") {
           locale = 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;
@@ -446,7 +447,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);
   }