commit fbd4e76f3de2f528106addb9808ca9d8d085f3bc
author Daniel Zheng <zhengdaniel@google.com> Thu Mar 30 20:38:59 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 30 20:38:59 2023 +0000
tree 94ebd9c182d24ea490ec2d6c5c721a955ddef5fd
parent 2d6c59ff4176dc10461cde2d985677b285cff267
parent 7e5d9609c8ce141b55a5f8512827a5a0055a07a8

Merge "Added check to copy AVB footer" am: 4aa47338f2 am: 4b9782620e am: 7e5d9609c8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2512556

Change-Id: Iafc7d3c3784fb69f49fcf7f43fbf823b10b86f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index e76cbc5..42269fe 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1197,7 +1197,8 @@
 }
 
 static void copy_avb_footer(const std::string& partition, struct fastboot_buffer* buf) {
-    if (buf->sz < AVB_FOOTER_SIZE || is_logical(partition)) {
+    if (buf->sz < AVB_FOOTER_SIZE || is_logical(partition) ||
+        should_flash_in_userspace(partition)) {
         return;
     }
     // If overflows and negative, it should be < buf->sz.