| commit | 17313e81d45bd8f26fb2663d2b8661749cd2dc1e | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Wed Mar 12 16:34:27 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 12 16:34:27 2025 -0700 |
| tree | ad3314ef677da6d71ee80a591ceca6be3a248d92 | |
| parent | 249731cfe57ba38cb22e97944108b4350fed5c09 [diff] | |
| parent | 79495fbaa13c0bdf8707ede037a2e4e59b3f5794 [diff] |
[automerger skipped] Free ISnapshotManager once update is done am: 47061dfdc4 am: 79495fbaa1 -s ours am skip reason: skipped by zhangkelvin Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3506416 Change-Id: I094370fd4dc06e4b0597b99986cdc439bad091a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 78a9a13..b10be76 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc
@@ -1542,6 +1542,12 @@ } bool DynamicPartitionControlAndroid::MapAllPartitions() { + // This flag tells us if VAB is enabled. In the case it's not (e.g. for + // secondary payloads) we are falling back on A/B and MapAllPartitions should + // just be a no-op + if (!target_supports_snapshot_) { + return true; + } return GetSnapshotManager()->MapAllSnapshots(kMapSnapshotTimeout); }