Report Android Build.MODEL in SystemProfileProto hardware_class.

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 <dlfcn.h>
 #include <sys/system_properties.h>
 
+#include "base/android/build_info.h"
 #include "base/android/sys_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info_internal.h"
 
 #if (__ANDROID_API__ >= 21 /* 5.0 - Lollipop */)
 
@@ skipping 146 matching lines @@
 }
 
 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() {
   char device_model_str[PROP_VALUE_MAX];
   __system_property_get("ro.product.model", device_model_str);

[jdduke (slow), 2015/07/10 19:16:05]

Hmm, shouldn't this property correspond to
base::android::BuildInfo::GetInstance()->model();? I wonder why we're pulling
these values directly instead of using base::android::BuildInfo.

[gone, 2015/07/10 20:58:11]

Probably for historic reasons that may not make sense anymore (IIRC I just moved
these over from another class).  If base::android::BuildInfo works and returns
the same string, it's worth using it.

[tdresser, 2015/07/13 13:19:22]

It doesn't look like we can get rid of |__system_property_get| in this file, as
it's needed for |GetDalvikHeapSizeMB|, among others.

In order to keep things consistent, I'll just use |GetDeviceName()|, which
appears to be the same thing as BuildInfo::model.

   return std::string(device_model_str);
 }
 
+std::string SysInfo::HardwareModelName() {
+  return base::android::BuildInfo::GetInstance()->model();

[Nico, 2015/07/10 19:52:22]

This does 14 jni calls to fill out BuildInfo and then ignores all but one of
them. I guess this will only be called very rarely so it's ok?

[jdduke (slow), 2015/07/10 20:01:14]

The JNI calls are only made when the singleton is constructed, and the singleton
itself is used all over the place (primarily for sdk_int()). I suspect it will
already have been constructed by the time we hit this getter.

That said, we should probably be consistent in this class, and it's still not
clear how this query differs from the above ro.product.model fetcher.

+}
+
 std::string SysInfo::OperatingSystemVersion() {
   int32 major, minor, bugfix;
   OperatingSystemVersionNumbers(&major, &minor, &bugfix);
   return StringPrintf("%d.%d.%d", major, minor, bugfix);
 }
 
 void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version) {
   // Read the version number string out from the properties.
@@ skipping 19 matching lines @@
     base::internal::LazySysInfoValue<bool,
         android::SysUtils::IsLowEndDeviceFromJni> >::Leaky
     g_lazy_low_end_device = LAZY_INSTANCE_INITIALIZER;
 
 bool SysInfo::IsLowEndDevice() {
   return g_lazy_low_end_device.Get().value();
 }
 
 
 }  // namespace base