commit 32ceeb45a68078ba7f6c1f3e1c7c0433c63c75eb
author Kelvin Zhang <zhangkelvin@google.com> Thu May 18 09:27:37 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Thu May 25 16:23:00 2023 +0000
tree 8e9bf0f3a9b8e51f576f8117c56f811072c8834e
parent 72e1ca17e25b8d9e70d5ac42d4f769cfcd8347eb

Prefer vendor prop when fetching ab partition list

ro.product.ab_ota_partitions is moving to vendor partition, as the ab
partition list is actually owned by vendors. Support both property
locations in update_engine, with the vendor one taking prioirty over
system one.

Test: th
Bug: 283042235
Change-Id: I4ee16cae0ad0570dcc25f7f00791375173f8fe69

payload_consumer/partition_update_generator_android.cc

diff --git a/payload_consumer/partition_update_generator_android.cc b/payload_consumer/partition_update_generator_android.cc
index 4467182..8a2e9f9 100644
--- a/payload_consumer/partition_update_generator_android.cc
+++ b/payload_consumer/partition_update_generator_android.cc
@@ -110,7 +110,11 @@
 std::vector<std::string>
 PartitionUpdateGeneratorAndroid::GetAbPartitionsOnDevice() const {
   auto partition_list_str =
-      android::base::GetProperty("ro.product.ab_ota_partitions", "");
+      android::base::GetProperty("ro.vendor.build.ab_ota_partitions", "");
+  if (partition_list_str.empty()) {
+    partition_list_str =
+        android::base::GetProperty("ro.product.ab_ota_partitions", "");
+  }
   return base::SplitString(partition_list_str,
                            ",",
                            base::TRIM_WHITESPACE,