commit 1c21eb8364f4d4468ac1f9aa562e402901f39bad
author Kelvin Zhang <zhangkelvin@google.com> Wed Mar 10 13:39:56 2021 -0500
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 11 00:32:35 2021 +0000
tree 823d0fc546fece9c0276b3f709d63c5ff3538a51
parent 48b788f0454f69176d74264356b262a8f53b0f89

Emit a warning instead of aborting

When applying a secondary payload, we might call UpdatePartitionMetadata
without VAB, so don't abort

Bug: 182310095
Test: th

Change-Id: I29af8aa653a8e3ccb37df2651883c6da09f727c7

aosp/dynamic_partition_control_android.cc

diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc
index 6bf896c..aba6deb 100644
--- a/aosp/dynamic_partition_control_android.cc
+++ b/aosp/dynamic_partition_control_android.cc
@@ -861,7 +861,7 @@
     uint32_t target_slot,
     const DeltaArchiveManifest& manifest) {
   // Check preconditions.
-  CHECK(!GetVirtualAbFeatureFlag().IsEnabled() || IsRecovery())
+  LOG_IF(WARNING, !GetVirtualAbFeatureFlag().IsEnabled() || IsRecovery())
       << "UpdatePartitionMetadata is called on a Virtual A/B device "
          "but source partitions is not deleted. This is not allowed.";