commit 7f41a2cc4dccb9af3cdaf23e6c61f90645cbc964
author Hridya Valsaraju <hridya@google.com> Wed Sep 19 16:29:01 2018 -0700
committer Hridya Valsaraju <hridya@google.com> Wed Sep 19 21:35:47 2018 -0700
tree 68596cb18a08d228352a41f874c228b2ff9d62c9
parent da46f9067a66ee4d58934d1c6e17d0397ea90da7

Enter into userspace fastboot only if the device supports it

Test: For devices not supporting logical partitions, 'adb reboot
fastboot' command reboots into  Android.
Bug: 78793464

Change-Id: Ie6c6ccdebfee9302a9996ac5bc66069dbd817987

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index c3168fc..c4e3af2 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -364,7 +364,8 @@
         std::string option = OPTIONS[option_index].name;
         if (option == "locale") {
           locale = optarg;
-        } else if (option == "fastboot") {
+        } else if (option == "fastboot" &&
+                   android::base::GetBoolProperty("ro.boot.logical_partitions", false)) {
           fastboot = true;
         }
         break;