commit 1b20be5a2bc54f6ae7d7add04c22b33429c28d53
author Sen Jiang <senj@google.com> Thu Jul 13 23:51:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 13 23:51:04 2017 +0000
tree 39ab5d8a6a28e6b4e9c9424f0865f7df79a315da
parent 3c1a3e60afb58eeb10520f311fb1c0f3d2392fa7
parent da3cc9808d72f258065fe67950fe0bc2e725b6ab

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

Change-Id: I619ae8f5bd79720d19d199f721ff06a6577dc88c

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;