commit ca7bf02d2ee5cc6816fdec2ffacb3d1e5dc4023d
author Hridya Valsaraju <hridya@google.com> Mon Sep 24 13:27:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 24 13:27:16 2018 -0700
tree 3097d45168b65d735e73f91fc40b7dc740155d9f
parent ae61f262e1693ccf6f1c393d5a10dcdb93b0ab37
parent ff47ab3ca4c0838dbc136273d84c2dc2c1be256a

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

Change-Id: Iacd90f207fcfeb6c7d47412cf41a7cdaf6507772

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;