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

am: ff47ab3ca4 Change-Id: Iacd90f207fcfeb6c7d47412cf41a7cdaf6507772
2018-09-24 13:27:16 -07:00
parent ae61f262e1 ff47ab3ca4
commit ca7bf02d2e
1 changed files with 2 additions and 1 deletions
@@ -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;