commit 047323b2bf829fb82815b2764e560449be2ca6d2
author Yifan Hong <elsk@google.com> Mon Apr 20 19:04:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 20 19:04:16 2020 +0000
tree e8c9c4969045e1e46ca0f029e98ade88fbe61603
parent c27e063303646f39a9f2f2271ef7b5ea5fcdec42
parent 5c5743f6c6e1e3a7f3928265fe46ad73e132f098

Also clear required_size if successful am: 5c5743f6c6

Change-Id: Ibe25e8ac9a859539f42c4d24ff081d847e70253c

dynamic_partition_control_android.cc

diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc
index bf31244..20e02ac 100644
--- a/dynamic_partition_control_android.cc
+++ b/dynamic_partition_control_android.cc
@@ -493,8 +493,13 @@
     }
   }
 
-  return PrepareDynamicPartitionsForUpdate(
-      source_slot, target_slot, manifest, delete_source);
+  TEST_AND_RETURN_FALSE(PrepareDynamicPartitionsForUpdate(
+      source_slot, target_slot, manifest, delete_source));
+
+  if (required_size != nullptr) {
+    *required_size = 0;
+  }
+  return true;
 }
 
 namespace {