diff options
author | Yifan Hong <elsk@google.com> | 2020-04-20 19:21:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-20 19:21:28 +0000 |
commit | bf4ffcae5dba09e8e0e8761faeb2e7d996c4d2ad (patch) | |
tree | 78f18cf82f125a1a34e15527b7c6648d4812c516 /dynamic_partition_control_android.cc | |
parent | 94fe469658647bddff0ed2a4870020007b83478d (diff) | |
parent | 047323b2bf829fb82815b2764e560449be2ca6d2 (diff) |
Also clear required_size if successful am: 5c5743f6c6 am: 047323b2bf
Change-Id: I7b6fc024f84efd54021b35c1f2c3dbc9bd28826f
Diffstat (limited to 'dynamic_partition_control_android.cc')
-rw-r--r-- | dynamic_partition_control_android.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dynamic_partition_control_android.cc b/dynamic_partition_control_android.cc index bf31244da..20e02ac84 100644 --- a/dynamic_partition_control_android.cc +++ b/dynamic_partition_control_android.cc @@ -493,8 +493,13 @@ bool DynamicPartitionControlAndroid::PreparePartitionsForUpdate( } } - 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 { |