| commit | addb8f0e2196e13ea091cbaf75b0a6cd48bd8b2d | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu May 25 13:06:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 25 13:06:21 2023 +0000 |
| tree | 6069b2021211824a512014d537fbe4715736e43d | |
| parent | 9e1230939f4c5dca68899992bab234281b2b59cd [diff] | |
| parent | f9a11a34072599810602c6a6421844da2b8bf767 [diff] |
Prefer vendor prop when fetching ab partition list am: 996766a950 am: 16ff6de8e1 am: f9a11a3407 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2597086 Change-Id: I0d16415dcc98e14dd19f7a48ff0c4c3b45eba4b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,