Merge "Adding force_flash functionality" into main

aosp-mirror · Aug 9, 2023 · eb21650 · eb21650
2 parents 86f037c + 376b704
commit eb21650
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fastboot/task.cpp b/fastboot/task.cpp
@@ -32,7 +32,7 @@ FlashTask::FlashTask(const std::string& slot, const std::string& pname, const st
 
 void FlashTask::Run() {
     auto flash = [&](const std::string& partition) {
-        if (should_flash_in_userspace(partition) && !is_userspace_fastboot()) {
+        if (should_flash_in_userspace(partition) && !is_userspace_fastboot() && !fp_->force_flash) {
             die("The partition you are trying to flash is dynamic, and "
                 "should be flashed via fastbootd. Please run:\n"
                 "\n"