commit 85c0f3e5673c1ba6b42df0358cdc3fd7f5c324cc
author Daniel Zheng <zhengdaniel@google.com> Fri Mar 10 23:27:17 2023 +0000
committer Daniel Zheng <zhengdaniel@google.com> Mon Mar 20 20:21:31 2023 +0000
tree 1d9293ad698f0204ae6c7ec316325abb1be13be8
parent f1ddba9dfd324f115f8903f6a879578d388f4279

Updated location of initialization

Test: tested flashall on raven
Bug: 194686221
Change-Id: Ie0dd7acd65833a938623e374e2b21e6bd6079d08

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index ffd4f67..256aeef 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1621,9 +1621,7 @@
     // or in bootloader fastboot.
     FlashImages(boot_images_);
 
-    auto flash_super_task = FlashSuperLayoutTask::Initialize(fp_, os_images_);
-
-    if (flash_super_task) {
+    if (auto flash_super_task = FlashSuperLayoutTask::Initialize(fp_, os_images_)) {
         flash_super_task->Run();
     } else {
         // Sync the super partition. This will reboot to userspace fastboot if needed.