commit da3cc9808d72f258065fe67950fe0bc2e725b6ab
author Sen Jiang <senj@google.com> Thu Jul 13 23:48:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:48:03 2017 +0000
tree 39ab5d8a6a28e6b4e9c9424f0865f7df79a315da
parent 97eb291f3f2565259f83465248c8dd32fddbae2d
parent 3faf4e7c91595f46a3bf80a348ca46b791d5b675

Report system_version in os version.
am: 3faf4e7c91

Change-Id: Ic82307f22c271146de66e673fb46f9234627d54a

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;