commit 9218e198677022cb7ef09edc44d2e08e1fad4d38
author Alessandro Astone <ales.astone@gmail.com> Wed Feb 26 17:30:50 2020 +0100
committer Jackeagle <jackeagle102@gmail.com> Tue Apr 06 11:49:23 2021 +0200
tree 29dbc1572fa366df12d9d9e9d176e638de88fc83
parent 62956572fb759b919c1ab056345d7f88c05210f4

reboot: allow opting-in to fastbootd

Change-Id: Iaf5eb813e848ef05b1b455ebfe3643f4a8b4f80d

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index a4fb08e..e758fb3 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -972,7 +972,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