diff options
Diffstat (limited to 'aosp/dynamic_partition_control_android.cc')
| -rw-r--r-- | aosp/dynamic_partition_control_android.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index ab349a82..538b57ce 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc @@ -1116,9 +1116,9 @@ DynamicPartitionControlAndroid::GetPartitionDevice( if (UpdateUsesSnapshotCompression() && slot != current_slot && IsDynamicPartition(partition_name, slot)) { return { - {.mountable_device_path = base::FilePath{std::string{VABC_DEVICE_DIR}} - .Append(partition_name_suffix) - .value(), + {.readonly_device_path = base::FilePath{std::string{VABC_DEVICE_DIR}} + .Append(partition_name_suffix) + .value(), .is_dynamic = true}}; } @@ -1137,7 +1137,7 @@ DynamicPartitionControlAndroid::GetPartitionDevice( &device)) { case DynamicPartitionDeviceStatus::SUCCESS: return {{.rw_device_path = device, - .mountable_device_path = device, + .readonly_device_path = device, .is_dynamic = true}}; case DynamicPartitionDeviceStatus::TRY_STATIC: @@ -1155,7 +1155,7 @@ DynamicPartitionControlAndroid::GetPartitionDevice( } return {{.rw_device_path = static_path, - .mountable_device_path = static_path, + .readonly_device_path = static_path, .is_dynamic = false}}; } @@ -1470,7 +1470,8 @@ bool DynamicPartitionControlAndroid::IsDynamicPartition( } bool DynamicPartitionControlAndroid::UpdateUsesSnapshotCompression() { - return snapshot_->UpdateUsesCompression(); + return GetVirtualAbFeatureFlag().IsEnabled() && + snapshot_->UpdateUsesCompression(); } } // namespace chromeos_update_engine |