Merge "Enter into userspace fastboot only if the device supports it"

am: c2e6f0410c Change-Id: I503f02ce45b582018672e84e04311ec2bac88c82
2018-09-24 13:07:55 -07:00
parent 4c65ab54c1 c2e6f0410c
commit 4e30d0d687
1 changed files with 2 additions and 1 deletions
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -364,7 +364,8 @@ int main(int argc, char** argv) {
        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;