diff options
| author | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | 2021-05-15 10:07:22 +0000 |
|---|---|---|
| committer | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | 2021-05-15 10:07:22 +0000 |
| commit | ac7fc8e1debff1f57afe79f144d8d16a1a0ec470 (patch) | |
| tree | 01ec931931503ed80f181b2d85efb5df0079e4ba /aosp/dynamic_partition_control_android.cc | |
| parent | 5d3613e99ec327d2ba487cc00de13b334618886f (diff) | |
| parent | f79cb91b4218a68642c94a01defc0594e742b3f4 (diff) | |
Snap for 7364285 from f79cb91b4218a68642c94a01defc0594e742b3f4 to s-keystone-qcom-release
Change-Id: I485b5b774533322ed4c78c3ceec5f945ea21b582
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 |