Commit 4ef44b6c authored by Mason Wilde's avatar Mason Wilde Committed by Commit Bot

ServiceConnection: Make vpd serial_number optional

Making this field required led to issues with test devices. This changes
it to optional like many other fields.

Bug: chromium:1146143
Change-Id: Ie0bdfe38462aef987021c42eec20749255d5ddf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536150Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Mason Wilde <masonwilde@google.com>
Cr-Commit-Position: refs/heads/master@{#827343}
parent 70b031e5
...@@ -1240,8 +1240,10 @@ class DeviceStatusCollectorState : public StatusCollectorState { ...@@ -1240,8 +1240,10 @@ class DeviceStatusCollectorState : public StatusCollectorState {
system_status_out->set_vpd_sku_number( system_status_out->set_vpd_sku_number(
system_info->product_sku_number.value()); system_info->product_sku_number.value());
} }
system_status_out->set_vpd_serial_number( if (system_info->product_serial_number.has_value()) {
system_info->product_serial_number); system_status_out->set_vpd_serial_number(
system_info->product_serial_number.value());
}
} }
if (report_system_info) { if (report_system_info) {
system_status_out->set_marketing_name(system_info->marketing_name); system_status_out->set_marketing_name(system_info->marketing_name);
......
...@@ -474,7 +474,7 @@ struct SystemInfo { ...@@ -474,7 +474,7 @@ struct SystemInfo {
// The product SKU number. // The product SKU number.
string? product_sku_number; string? product_sku_number;
// The product serial number. // The product serial number.
string product_serial_number; string? product_serial_number;
// Contents of CrosConfig in /arc/build-properties/marketing-name. // Contents of CrosConfig in /arc/build-properties/marketing-name.
string marketing_name; string marketing_name;
// The BIOS version. // The BIOS version.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment