commit bf4ffcae5dba09e8e0e8761faeb2e7d996c4d2ad
author Yifan Hong <elsk@google.com> Mon Apr 20 19:21:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 20 19:21:28 2020 +0000
tree 78f18cf82f125a1a34e15527b7c6648d4812c516
parent 94fe469658647bddff0ed2a4870020007b83478d
parent 047323b2bf829fb82815b2764e560449be2ca6d2

Also clear required_size if successful am: 5c5743f6c6 am: 047323b2bf

Change-Id: I7b6fc024f84efd54021b35c1f2c3dbc9bd28826f

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 {