Merge pull request #3299 from t-nelson/pivos_android_generic_hw_queries

droid: add generic hardware queries and hook them up to new Build class

diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 10d3812..0fde83b 100644 (file)
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -47,6 +47,9 @@
 #include "powermanagement/PowerManager.h"
 #include "utils/StringUtils.h"
 #include "utils/XMLUtils.h"
+#if defined(TARGET_ANDROID)
+#include "android/jni/Build.h"
+#endif
 
 /* Target identification */
 #if defined(TARGET_DARWIN)
@@ -364,6 +367,33 @@ CStdString CSysInfo::GetCPUSerial()
   return "Serial: " + g_cpuInfo.getCPUSerial();
 }
 
+CStdString CSysInfo::GetManufacturer()
+{
+  CStdString manufacturer = "";
+#if defined(TARGET_ANDROID)
+  manufacturer = CJNIBuild::MANUFACTURER;
+#endif
+  return manufacturer;
+}
+
+CStdString CSysInfo::GetModel()
+{
+  CStdString model = "";
+#if defined(TARGET_ANDROID)
+  model = CJNIBuild::MODEL;
+#endif
+  return model;
+}
+
+CStdString CSysInfo::GetProduct()
+{
+  CStdString product = "";
+#if defined(TARGET_ANDROID)
+  product = CJNIBuild::PRODUCT;
+#endif
+  return product;
+}
+
 bool CSysInfo::IsAeroDisabled()
 {
 #ifdef TARGET_WINDOWS

diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h
index 13e853e..379cd1a 100644 (file)
--- a/xbmc/utils/SystemInfo.h
+++ b/xbmc/utils/SystemInfo.h
@@ -127,6 +127,9 @@ public:
   CStdString GetCPUHardware();
   CStdString GetCPURevision();
   CStdString GetCPUSerial();
+  CStdString GetManufacturer();
+  CStdString GetProduct();
+  CStdString GetModel();
   bool GetDiskSpace(const CStdString drive,int& iTotal, int& iTotalFree, int& iTotalUsed, int& iPercentFree, int& iPercentUsed);
   CStdString GetHddSpaceInfo(int& percent, int drive, bool shortText=false);
   CStdString GetHddSpaceInfo(int drive, bool shortText=false);