summaryrefslogtreecommitdiffstats
path: root/base/sys_info_posix.cc
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 04:52:45 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 04:52:45 +0000
commit82aeeaaa67b98f2fe702cdfc47ffeaa2c87c1cc7 (patch)
tree6575f9c90d83edd5a17eb166ec51dff35771ba24 /base/sys_info_posix.cc
parente55f6a797e2b8b69352d6484d5cc48dade6e67bf (diff)
downloadchromium_src-82aeeaaa67b98f2fe702cdfc47ffeaa2c87c1cc7.zip
chromium_src-82aeeaaa67b98f2fe702cdfc47ffeaa2c87c1cc7.tar.gz
chromium_src-82aeeaaa67b98f2fe702cdfc47ffeaa2c87c1cc7.tar.bz2
Fix OperationSystemVersion() on Android.
Right now it returns the underlying kernal version instead of the Android version. However, OperatingSystemVersionNumbers returns the Android version. Per discussion with Android folks, we agree the Android version should be returned. This CL copies what we do for Mac version. This piece of information could be very useful in defining driver bug workarounds in a finer grid on Android. BUG=225582 TEST=OperationSystemVersion() returns android version, see about:gpu R=brettw Review URL: https://chromiumcodereview.appspot.com/14631004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_posix.cc')
-rw-r--r--base/sys_info_posix.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index 57b7af6..ca18894 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -61,7 +61,7 @@ std::string SysInfo::OperatingSystemName() {
}
#endif
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
// static
std::string SysInfo::OperatingSystemVersion() {
struct utsname info;