sync with upstreamHEADmaster

1 files changed, 55 insertions, 54 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
index aad3a28..ef2d728 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
@@ -47,67 +47,68 @@ namespace kodi
 {
 namespace platform
 {
-  class CInterfaceAndroidSystem
+class ATTRIBUTE_HIDDEN CInterfaceAndroidSystem
+{
+public:
+  CInterfaceAndroidSystem()
+    : m_interface(static_cast<AddonToKodiFuncTable_android_system*>(
+          GetInterface(INTERFACE_ANDROID_SYSTEM_NAME, INTERFACE_ANDROID_SYSTEM_VERSION))){};
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request an JNI env pointer for the calling thread.
+  /// JNI env has to be controlled by kodi because of the underlying
+  /// threading concep.
+  ///
+  /// @param[in]:
+  /// @return JNI env pointer for the calling thread
+  ///
+  inline void* GetJNIEnv()
   {
-  public:
-    CInterfaceAndroidSystem()
-     : m_interface(static_cast<AddonToKodiFuncTable_android_system*>(GetInterface(INTERFACE_ANDROID_SYSTEM_NAME, INTERFACE_ANDROID_SYSTEM_VERSION)))
-     {};
+    if (m_interface)
+      return m_interface->get_jni_env();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request an JNI env pointer for the calling thread.
-    /// JNI env has to be controlled by kodi because of the underlying
-    /// threading concep.
-    ///
-    /// @param[in]:
-    /// @return JNI env pointer for the calling thread
-    ///
-    inline void * GetJNIEnv()
-    {
-      if (m_interface)
-        return m_interface->get_jni_env();
+    return nullptr;
+  }
+  //----------------------------------------------------------------------------
 
-      return nullptr;
-    }
-    //----------------------------------------------------------------------------
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request the android sdk version to e.g. initialize JNIBase.
+  ///
+  /// @param[in]:
+  /// @return Android SDK version
+  ///
+  inline int GetSDKVersion()
+  {
+    if (m_interface)
+      return m_interface->get_sdk_version();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request the android sdk version to e.g. initialize JNIBase.
-    ///
-    /// @param[in]:
-    /// @return Android SDK version
-    ///
-    inline int GetSDKVersion()
-    {
-      if (m_interface)
-        return m_interface->get_sdk_version();
+    return 0;
+  }
 
-      return 0;
-    }
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request the android main class name e.g. org.xbmc.kodi.
+  ///
+  /// @param[in]:
+  /// @return package class name
+  ///
+  inline std::string GetClassName()
+  {
+    if (m_interface)
+      return m_interface->get_class_name();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request the android main class name e.g. org.xbmc.kodi.
-    ///
-    /// @param[in]:
-    /// @return package class name
-    ///
-    inline std::string GetClassName()
-    {
-      if (m_interface)
-        return m_interface->get_class_name();
+    return std::string();
+  }
 
-      return std::string();
-    }
+private:
+  AddonToKodiFuncTable_android_system* m_interface;
+};
+//----------------------------------------------------------------------------
 
-  private:
-    AddonToKodiFuncTable_android_system *m_interface;
-  };
-  //----------------------------------------------------------------------------
 } /* namespace platform */
 } /* namespace kodi */