Don't fail downgrade check for partitions without version
Some partitions, e.g. vbmeta, won't have timestamp. And the existing
downgrade check will fail for these partitions for partial updates.
This cl switches the logic to allow empty version for a given
partition in the payload, if that source partition doesn't have
version (timestamp) on device. This way, we can avoid adding another
hardcoded list of partitions with build props.
Bug: 170796643
Test: install a partial update on cuttlefish
Change-Id: I747910b353bd71e10ec7c32ebb125bde6c16e48a
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 9bf6d7e..e7ef8a3 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -1132,28 +1132,35 @@
auto&& timestamp_valid = [this](const PartitionUpdate& partition,
bool allow_empty_version,
bool* downgrade_detected) -> ErrorCode {
+ const auto& partition_name = partition.partition_name();
if (!partition.has_version()) {
+ if (hardware_->GetVersionForLogging(partition_name).empty()) {
+ LOG(INFO) << partition_name << " does't have version, skipping "
+ << "downgrade check.";
+ return ErrorCode::kSuccess;
+ }
+
if (allow_empty_version) {
return ErrorCode::kSuccess;
}
LOG(ERROR)
- << "PartitionUpdate " << partition.partition_name()
- << " does ot have a version field. Not allowed in partial updates.";
+ << "PartitionUpdate " << partition_name
+ << " doesn't have a version field. Not allowed in partial updates.";
return ErrorCode::kDownloadManifestParseError;
}
- auto error_code = hardware_->IsPartitionUpdateValid(
- partition.partition_name(), partition.version());
+ auto error_code =
+ hardware_->IsPartitionUpdateValid(partition_name, partition.version());
switch (error_code) {
case ErrorCode::kSuccess:
break;
case ErrorCode::kPayloadTimestampError:
*downgrade_detected = true;
- LOG(WARNING) << "PartitionUpdate " << partition.partition_name()
+ LOG(WARNING) << "PartitionUpdate " << partition_name
<< " has an older version than partition on device.";
break;
default:
- LOG(ERROR) << "IsPartitionUpdateValid(" << partition.partition_name()
+ LOG(ERROR) << "IsPartitionUpdateValid(" << partition_name
<< ") returned" << utils::ErrorCodeToString(error_code);
break;
}