commit 542582689d53fc3a1c9d8297e42b7aa92291b7fe
author Hridya Valsaraju <hridya@google.com> Wed Sep 19 21:14:18 2018 -0700
committer Hridya Valsaraju <hridya@google.com> Tue Sep 25 03:52:12 2018 +0000
tree bff3e85e828275f10205affaedf36f0cde670148
parent 6590255dbbcbd35c527b3a2e6871275ec88fee64

Support 'adb reboot fastboot' command conditionally.

Devices not supporting logical partitions do not require the command.

Bug: 78793464
Test: 'adb reboot fastboot' reboots to bootloader for a device
not supporting logical partitions.

Change-Id: I0a7b6d4335040e24efbf461e2dd2d56ab1985b7f

adb/daemon/services.cpp

diff --git a/adb/daemon/services.cpp b/adb/daemon/services.cpp
index 8417690..2bac486 100644
--- a/adb/daemon/services.cpp
+++ b/adb/daemon/services.cpp
@@ -103,7 +103,9 @@
     if (reboot_arg.empty()) reboot_arg = "adb";
     std::string reboot_string = android::base::StringPrintf("reboot,%s", reboot_arg.c_str());
 
-    if (reboot_arg == "fastboot" && access("/dev/socket/recovery", F_OK) == 0) {
+    if (reboot_arg == "fastboot" &&
+        android::base::GetBoolProperty("ro.boot.logical_partitions", false) &&
+        access("/dev/socket/recovery", F_OK) == 0) {
         LOG(INFO) << "Recovery specific reboot fastboot";
         /*
          * The socket is created to allow switching between recovery and