OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/sys_info.h" | 5 #include "base/sys_info.h" |
6 | 6 |
7 #include <sys/system_properties.h> | 7 #include <sys/system_properties.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_number_conversions.h" | |
11 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| 11 #include "base/strings/string_number_conversions.h" |
12 | 12 |
13 namespace { | 13 namespace { |
14 | 14 |
15 // Default version of Android to fall back to when actual version numbers | 15 // Default version of Android to fall back to when actual version numbers |
16 // cannot be acquired. | 16 // cannot be acquired. |
17 // TODO(dfalcantara): Keep this reasonably up to date with the latest publicly | 17 // TODO(dfalcantara): Keep this reasonably up to date with the latest publicly |
18 // available version of Android. | 18 // available version of Android. |
19 static const int kDefaultAndroidMajorVersion = 4; | 19 static const int kDefaultAndroidMajorVersion = 4; |
20 static const int kDefaultAndroidMinorVersion = 0; | 20 static const int kDefaultAndroidMinorVersion = 0; |
21 static const int kDefaultAndroidBugfixVersion = 3; | 21 static const int kDefaultAndroidBugfixVersion = 3; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 ParseOSVersionNumbers(os_version_str, major_version, minor_version, | 116 ParseOSVersionNumbers(os_version_str, major_version, minor_version, |
117 bugfix_version); | 117 bugfix_version); |
118 } | 118 } |
119 | 119 |
120 int SysInfo::DalvikHeapSizeMB() { | 120 int SysInfo::DalvikHeapSizeMB() { |
121 static int heap_size = GetDalvikHeapSizeMB(); | 121 static int heap_size = GetDalvikHeapSizeMB(); |
122 return heap_size; | 122 return heap_size; |
123 } | 123 } |
124 | 124 |
125 } // namespace base | 125 } // namespace base |
OLD | NEW |