commit aafa8c4c540d0ae29783c3f96cb9b9ecd153367f
author Kelvin Zhang <zhangkelvin@google.com> Sat Jan 23 02:18:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 23 02:18:23 2021 +0000
tree dce448543d4c629e8008af0ae75177d961a7390c
parent c42070aadceca2e2e6fc22c324dbc4bd2f1e452b
parent ff40fe87ea6ba82a713c89956e7457b98a3c2164

Don't use VABC in recovery am: b9a5f61c2e am: 0b38281be6 am: ff40fe87ea

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1557591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b1560ca370c5675c3cbc4562efdfd3e21318176

aosp/dynamic_partition_control_android.cc

diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc
index 1575796..c75d5e9 100644
--- a/aosp/dynamic_partition_control_android.cc
+++ b/aosp/dynamic_partition_control_android.cc
@@ -46,6 +46,8 @@
 #include "update_engine/aosp/cleanup_previous_update_action.h"
 #include "update_engine/aosp/dynamic_partition_utils.h"
 #include "update_engine/common/boot_control_interface.h"
+#include "update_engine/common/dynamic_partition_control_interface.h"
+#include "update_engine/common/platform_constants.h"
 #include "update_engine/common/utils.h"
 #include "update_engine/payload_consumer/delta_performer.h"
 
@@ -138,6 +140,10 @@
 
 FeatureFlag
 DynamicPartitionControlAndroid::GetVirtualAbCompressionFeatureFlag() {
+  if constexpr (constants::kIsRecovery) {
+    // Don't attempt VABC in recovery
+    return FeatureFlag(FeatureFlag::Value::NONE);
+  }
   return virtual_ab_compression_;
 }