commit b9a5f61c2e076838d64c31ba16471094a3e1053a
author Kelvin Zhang <zhangkelvin@google.com> Fri Jan 22 14:34:05 2021 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Fri Jan 22 14:35:44 2021 -0500
tree 6ed05506e88efa6ba1d14d5b44d5402ee42f73cf
parent ad8ea1059bf8a68d25fc3883b7c20f8f41207de7

Don't use VABC in recovery

Test: boot into recovery, make sure OTA works

Change-Id: I672d18806b2dbaf259ede406ef49f9baed2d0c6e

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_;
 }