commit 880e2be7471409e68de790fa9c20bc4348a9c694
author Sen Jiang <senj@google.com> Wed Mar 07 23:36:31 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 07 23:36:31 2018 +0000
tree 7e02697eff34c51948c601e541205d70df01e6d5
parent ed98abfb7865c749f9f54a7699a70f40a2d812a8
parent c497759451473b7b99421575683c96a02732e3be

Also set system version to ForcedUpdate. am: f87e5cd57a
am: c497759451

Change-Id: Ib2d2c5cd90a2656ee8d7743fd7111dd253c16721

omaha_request_params.cc

diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index 9e78a93..97a2ed1 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -77,10 +77,14 @@
   LOG(INFO) << "Running from channel " << image_props_.current_channel;
 
   os_platform_ = constants::kOmahaPlatformName;
-  if (!image_props_.system_version.empty())
+  if (!image_props_.system_version.empty()) {
+    if (in_app_version == "ForcedUpdate") {
+      image_props_.system_version = in_app_version;
+    }
     os_version_ = image_props_.system_version;
-  else
+  } else {
     os_version_ = OmahaRequestParams::kOsVersion;
+  }
   if (!in_app_version.empty())
     image_props_.version = in_app_version;