From 741c2d4da7dfb6e97bf7819e48b19e3214b5c09b Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 13 Apr 2021 12:40:38 -0400 Subject: Check for VAB flag before calling UpdateUsesCompression On a device which doen't support VAB, calligng UpdateUsesCompression directly will cause libsnapshot to print error logs. Therefore check for VAB support first. Test: th Change-Id: Icfbf848908939069493f6c10f6a69f022b9b8350 --- aosp/dynamic_partition_control_android.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'aosp/dynamic_partition_control_android.cc') diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index ab349a82..93a10bb7 100644 --- a/aosp/dynamic_partition_control_android.cc +++ b/aosp/dynamic_partition_control_android.cc @@ -1470,7 +1470,8 @@ bool DynamicPartitionControlAndroid::IsDynamicPartition( } bool DynamicPartitionControlAndroid::UpdateUsesSnapshotCompression() { - return snapshot_->UpdateUsesCompression(); + return GetVirtualAbFeatureFlag().IsEnabled() && + snapshot_->UpdateUsesCompression(); } } // namespace chromeos_update_engine -- cgit v1.2.3 From a9b5d8c8eec4534c3433466fc6766ede675d16ce Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Wed, 5 May 2021 09:17:46 -0400 Subject: Rename postinstall_mount_device to readonly_target_path When postinstall_mount_device is initially introduced, it's only intended to be used by postinstall action, hence the name. Now we plan to use it for fs verification purpose as well, rename for better clarity. Test: th Change-Id: Iff996f2f513bb44694e39d758a69851793b9a565 --- aosp/dynamic_partition_control_android.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'aosp/dynamic_partition_control_android.cc') diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc index 93a10bb7..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}}; } -- cgit v1.2.3