commit ff47ab3ca4c0838dbc136273d84c2dc2c1be256a
author Hridya Valsaraju <hridya@google.com> Mon Sep 24 13:15:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 24 13:15:06 2018 -0700
tree 3097d45168b65d735e73f91fc40b7dc740155d9f
parent 68f9636e63fd9bf919d7ceb152a5bf29ae669ae9
parent 4e30d0d6874296e733b65210ca626f0d85d8d4dd

Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c
am: 4e30d0d687

Change-Id: Ibc7f6627e6f4dc246158bd7d9c44e26af4243334

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index 29a5865..7835094 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;