commit a6f4daf4a5e8af1db22d76a56312668cdd396733
author Sen Jiang <senj@google.com> Thu Jul 13 23:54:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:54:34 2017 +0000
tree 39ab5d8a6a28e6b4e9c9424f0865f7df79a315da
parent 1d817ac2a66bfa4d6cced87cc700096775dae3f7
parent 1b20be5a2bc54f6ae7d7add04c22b33429c28d53

Report system_version in os version. am: 3faf4e7c91 am: da3cc9808d
am: 1b20be5a2b

Change-Id: I64241a6abaa475afa92093d5d7ef7b1c402ec5ad

omaha_request_params.cc

diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index 3402451..3ba7037 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -77,7 +77,10 @@
   LOG(INFO) << "Running from channel " << image_props_.current_channel;
 
   os_platform_ = constants::kOmahaPlatformName;
-  os_version_ = OmahaRequestParams::kOsVersion;
+  if (!image_props_.system_version.empty())
+    os_version_ = image_props_.system_version;
+  else
+    os_version_ = OmahaRequestParams::kOsVersion;
   if (!in_app_version.empty())
     image_props_.version = in_app_version;