commit d9ff210e631d105885e3baad87be0dc8386c3a12
author Alex Light <allight@google.com> Thu Jun 16 21:46:06 2016 +0000
committer Alex Light <allight@google.com> Thu Jun 16 15:22:22 2016 -0700
tree 08f9d7dae0448d0f81e785d1266eb12ef7c30bee
parent 13cf49d8eb2702f92f8008f01d281044b3a5c8d2

Fix issue where non-AB-ota devices will cause flashall to fail.

We now check that a device has slots before trying to get the name of
any of them.

Bug: 29278988

Change-Id: I50f3596e467afae20177ce4e458e697435223c51

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 41d6011..142a5e8 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -860,6 +860,11 @@
     }
 }
 
+static bool has_slots(Transport* transport) {
+  std::string suffix_list_unused;
+  return fb_getvar(transport, "slot-suffixes", &suffix_list_unused);
+}
+
 static std::vector<std::string> get_suffixes(Transport* transport) {
     std::vector<std::string> suffixes;
     std::string suffix_list;
@@ -1067,7 +1072,9 @@
 
 static void do_flashall(Transport* transport, const char* slot_override, int erase_first) {
     queue_info_dump();
+    const bool device_has_slots = has_slots(transport);
     const bool has_slot_override = slot_override != nullptr && strcmp(slot_override, "") != 0;
+    const bool should_ignore_slots = !device_has_slots || has_slot_override;
 
     fb_queue_query_save("product", cur_product, sizeof(cur_product));
 
@@ -1081,7 +1088,7 @@
     setup_requirements(reinterpret_cast<char*>(data), sz);
 
     for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
-        if (has_slot_override && !images[i].active_slot) {
+        if (should_ignore_slots && !images[i].active_slot) {
             // We will not do anything with _other files if we are given an explicit slot to use.
             continue;
         }
@@ -1096,7 +1103,7 @@
         // sometimes write the 'active + 1'th slot for first boot optimization reasons. This is
         // defined by the images array unless one is explicitly provided.
         std::string real_slot_override;
-        if (has_slot_override) {
+        if (should_ignore_slots) {
             real_slot_override = slot_override;
         } else {
             real_slot_override = get_slot_name(transport, images[i].active_slot ? 0 : 1);