Extract new system version from Omaha responses
When processing an Omaha response, line up the app elements for the main
product and system apps, by their appid fields. This allows the (product)
version and system version to be differentiated and recorded in the
InstallPlan.
Bug: 65422956
Test: Unit-tests, and using a live OTA
Change-Id: I5217b7ac6fbf6f7ae595c1cec6fbc329051925eb
(cherry picked from commit 19ef6db4885387a5e3fbd2affcbd57a9a40d8b9b)
diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index d5d745b..b0dff31 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -74,7 +74,14 @@
InstallPayloadTypeToString(payload.type).c_str());
}
+ string version_str = base::StringPrintf(", version: %s", version.c_str());
+ if (!system_version.empty()) {
+ version_str +=
+ base::StringPrintf(", system_version: %s", system_version.c_str());
+ }
+
LOG(INFO) << "InstallPlan: " << (is_resume ? "resume" : "new_update")
+ << version_str
<< ", source_slot: " << BootControlInterface::SlotName(source_slot)
<< ", target_slot: " << BootControlInterface::SlotName(target_slot)
<< ", url: " << download_url << payloads_str << partitions_str