diff options
Diffstat (limited to 'aosp/dynamic_partition_control_android.cc')
| -rw-r--r-- | aosp/dynamic_partition_control_android.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 657eec9a..6bf896c5 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc @@ -939,6 +939,12 @@ bool DynamicPartitionControlAndroid::UpdatePartitionMetadata( << " to size " << partition_size << ". Not enough space?"; return false; } + if (p->size() < partition_size) { + LOG(ERROR) << "Partition " << partition_name_suffix + << " was expected to have size " << partition_size + << ", but instead has size " << p->size(); + return false; + } LOG(INFO) << "Added partition " << partition_name_suffix << " to group " << group_name_suffix << " with size " << partition_size; } @@ -1015,9 +1021,11 @@ DynamicPartitionControlAndroid::GetPartitionDevice( partition_name + SlotSuffixForSlotNumber(slot); if (UpdateUsesSnapshotCompression() && IsDynamicPartition(partition_name) && slot != current_slot) { - return {{.mountable_device_path = - GetStaticDevicePath(device_dir, partition_name_suffix), - .is_dynamic = true}}; + return { + {.mountable_device_path = base::FilePath{std::string{VABC_DEVICE_DIR}} + .Append(partition_name_suffix) + .value(), + .is_dynamic = true}}; } // When looking up target partition devices, treat them as static if the |