commit 87dabc941a0cb533ca789ccb7db88605c9e78b62
author Alessandro Astone <ales.astone@gmail.com> Wed Feb 26 17:30:50 2020 +0100
committer Tim Zimmermann <tim@linux4.de> Sun Mar 24 06:44:18 2024 +0100
tree f4d9f58312ddfd2716b376a4aa7dce4da503feb9
parent a03745fa390b87b32b63f7263973a7c7d53fcdf2

reboot: allow opting-in to fastbootd

Change-Id: Iaf5eb813e848ef05b1b455ebfe3643f4a8b4f80d

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 1a26c4d..a9c1e36 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -1057,7 +1057,8 @@
             // adb reboot fastboot should boot into bootloader for devices not
             // supporting logical partitions.
             if (reboot_target == "fastboot" &&
-                !android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
+                !android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) &&
+                !android::base::GetBoolProperty("ro.fastbootd.available", false)) {
                 reboot_target = "bootloader";
             }
             // When rebooting to the bootloader notify the bootloader writing