commit 9fc62b81321a6bb1a646776596acc23cbbc9d399
author Daniel Zheng <zhengdaniel@google.com> Fri Mar 24 22:57:20 2023 +0000
committer Daniel Zheng <zhengdaniel@google.com> Tue Mar 28 16:00:40 2023 -0700
tree c3facd0a2c55bffd2d0ffbad6121cc05b43d3149
parent 0a6ac9f16c0e048bf350840667ba335a5d36fcf9

Added a field to set enable_vabc

Test: tested OTA on cuttlefish
Bug: 274511687
Change-Id: I55bee646f0b075b30a1fd533f8baa44eeaaac8f9

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 72c9b53..3b9f2b6 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -521,6 +521,9 @@
                   << " is " << partition.estimate_cow_size();
       }
     }
+    if (install_plan_->disable_vabc) {
+      manifest_.mutable_dynamic_partition_metadata()->set_vabc_enabled(false);
+    }
     if (install_plan_->enable_threading) {
       manifest_.mutable_dynamic_partition_metadata()
           ->mutable_vabc_feature_set()

payload_consumer/install_plan.h

diff --git a/payload_consumer/install_plan.h b/payload_consumer/install_plan.h
index 8fe104a..93aebce 100644
--- a/payload_consumer/install_plan.h
+++ b/payload_consumer/install_plan.h
@@ -74,6 +74,7 @@
 
   bool is_resume{false};
   bool vabc_none{false};
+  bool disable_vabc{false};
   std::string download_url;  // url to download from
   std::string version;       // version we are installing.