Report Android Build.MODEL in SystemProfileProto hardware_class.

base/sys_info_android.cc

Index: base/sys_info_android.cc
diff --git a/base/sys_info_android.cc b/base/sys_info_android.cc
index 245097ffdc092626923e8bcb2f1bbf99e08e51d6..c288ae2fe87f7ce3e68edb513bd2c5c45849ef83 100644
--- a/base/sys_info_android.cc
+++ b/base/sys_info_android.cc
@@ -155,28 +155,16 @@ int GetDalvikHeapGrowthLimitMB() {
 
 namespace base {
 
-std::string SysInfo::OperatingSystemName() {
-  return "Android";
-}
-
-std::string SysInfo::GetAndroidBuildCodename() {
-  char os_version_codename_str[PROP_VALUE_MAX];
-  __system_property_get("ro.build.version.codename", os_version_codename_str);
-  return std::string(os_version_codename_str);
-}
-
-std::string SysInfo::GetAndroidBuildID() {
-  char os_build_id_str[PROP_VALUE_MAX];
-  __system_property_get("ro.build.id", os_build_id_str);
-  return std::string(os_build_id_str);
-}
-
-std::string SysInfo::GetDeviceName() {
+std::string SysInfo::HardwareModelName() {
   char device_model_str[PROP_VALUE_MAX];
   __system_property_get("ro.product.model", device_model_str);

[Alexei Svitkine (slow), 2015/07/14 20:20:39]

Hmm, there's a bug saying that this API is deprecated:

https://code.google.com/p/chromium/issues/detail?id=392191

Is there a better API that can be used?

[jdduke (slow), 2015/07/14 20:29:57]

Well, there's BuildInfo::model() which gets it's data directly from the Android
Build.MODEL. Dan was worried that this might introduce some discontinuities in
our data, though it looks like under the covers Build.MODEL is just
getString("ro.product.model");

   return std::string(device_model_str);
 }
 
+std::string SysInfo::OperatingSystemName() {
+  return "Android";
+}
+
 std::string SysInfo::OperatingSystemVersion() {
   int32 major, minor, bugfix;
   OperatingSystemVersionNumbers(&major, &minor, &bugfix);
@@ -195,6 +183,18 @@ void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                         bugfix_version);
 }
 
+std::string SysInfo::GetAndroidBuildCodename() {
+  char os_version_codename_str[PROP_VALUE_MAX];
+  __system_property_get("ro.build.version.codename", os_version_codename_str);
+  return std::string(os_version_codename_str);
+}
+
+std::string SysInfo::GetAndroidBuildID() {
+  char os_build_id_str[PROP_VALUE_MAX];
+  __system_property_get("ro.build.id", os_build_id_str);
+  return std::string(os_build_id_str);
+}
+
 int SysInfo::DalvikHeapSizeMB() {
   static int heap_size = GetDalvikHeapSizeMB();
   return heap_size;