Fix OperationSystemVersion() on Android.

base/sys_info_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <sys/system_properties.h>
 
 #include "base/logging.h"
+#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 
 namespace {
 
 // Default version of Android to fall back to when actual version numbers
 // cannot be acquired.
 // TODO(dfalcantara): Keep this reasonably up to date with the latest publicly
 //                    available version of Android.
 static const int kDefaultAndroidMajorVersion = 4;
@@ skipping 107 matching lines @@
   __system_property_get("ro.build.id", os_build_id_str);
   return std::string(os_build_id_str);
 }
 
 std::string SysInfo::GetDeviceName() {
   char device_model_str[PROP_VALUE_MAX];
   __system_property_get("ro.product.model", device_model_str);
   return std::string(device_model_str);
 }
 
+std::string SysInfo::OperatingSystemVersion() {
+  int32 major, minor, bugfix;
+  OperatingSystemVersionNumbers(&major, &minor, &bugfix);
+  return base::StringPrintf("%d.%d.%d", major, minor, bugfix);

[brettw, 2013/05/06 22:56:24]

Don't need "base::" here (you're already in base).

[Zhenyao Mo, 2013/05/06 23:07:07]

Done.

+}
+
 void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version) {
   // Read the version number string out from the properties.
   char os_version_str[PROP_VALUE_MAX];
   __system_property_get("ro.build.version.release", os_version_str);
 
   // Parse out the numbers.
   ParseOSVersionNumbers(os_version_str, major_version, minor_version,
                         bugfix_version);
 }
 
 int SysInfo::DalvikHeapSizeMB() {
   static int heap_size = GetDalvikHeapSizeMB();
   return heap_size;
 }
 
 int SysInfo::DalvikHeapGrowthLimitMB() {
   static int heap_growth_limit = GetDalvikHeapGrowthLimitMB();
   return heap_growth_limit;
 }
 
 
 }  // namespace base