commit c2e6f0410c3d730bfc043ecd90b13df8c4536464
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 24 19:41:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 24 19:41:22 2018 +0000
tree 3097d45168b65d735e73f91fc40b7dc740155d9f
parent ff29eb7f12ffce5cfd63fb73c17d8ed170eed29e
parent 7f41a2cc4dccb9af3cdaf23e6c61f90645cbc964

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

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;