| commit | 16ff6de8e179769f134135be33981915cb263550 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu May 25 11:38:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 25 11:38:08 2023 +0000 |
| tree | 241b43ff4fe8c57d467aea4a03d66e031c25d58c | |
| parent | d7d2ba702ffa207a48c63a19b2e639ac07f0d044 [diff] | |
| parent | 996766a9508273a8dae5dee1f5de63fa01aee29b [diff] |
Prefer vendor prop when fetching ab partition list am: 996766a950 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2597086 Change-Id: I6fc42e2c884a3c9a7d00de861eedf6423b6cc7ca 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,