Merge branch 'main' into SystemPluginMasterToStable2-Sprint2009-Sprin…

…t2010-Changes
nhanasi · Nov 30, 2020 · 967bb2d · 967bb2d
2 parents 84db8e0 + d03c514
commit 967bb2d
Show file tree

Hide file tree

Showing 11 changed files with 223 additions and 225 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp
@@ -1628,9 +1628,18 @@ namespace WPEFramework {
                 //check to see if plugin already exists
                 bool newPluginFound = false;
                 bool originalPluginFound = false;
+                uint32_t pluginsFound = 0;
                 {
                     Core::JSON::ArrayType<PluginHost::MetaData::Service> availablePluginResult;
-                    uint32_t status = getThunderControllerClient()->Get<Core::JSON::ArrayType<PluginHost::MetaData::Service>>(2000, "status", availablePluginResult);
+                    uint32_t status = getThunderControllerClient()->Get<Core::JSON::ArrayType<PluginHost::MetaData::Service>>(3500, "status", availablePluginResult);
+
+                    std::cout << "status status: " << status << std::endl;
+                    if (status > 0)
+                    {
+                        std::cout << "trying status one more time...\n";
+                        status = getThunderControllerClient()->Get<Core::JSON::ArrayType<PluginHost::MetaData::Service>>(10000, "status", availablePluginResult);
+                        std::cout << "status status: " << status << std::endl;
+                    }
 
                     for (uint16_t i = 0; i < availablePluginResult.Length(); i++)
                     {
@@ -1647,10 +1656,12 @@ namespace WPEFramework {
                             originalPluginFound = true;
                         }
                     }
+                    pluginsFound = availablePluginResult.Length();
                 }
 
                 if (!newPluginFound && !originalPluginFound)
                 {
+                    std::cout << "number of types found: " << pluginsFound << std::endl;
                     response["message"] = "failed to launch application.  type not found";
                     returnResponse(false);
                 }

diff --git a/Timer/CMakeLists.txt b/Timer/CMakeLists.txt
@@ -23,7 +23,8 @@ find_package(${NAMESPACE}Plugins REQUIRED)
 add_library(${MODULE_NAME} SHARED
         Timer.cpp
         Module.cpp
-        ../helpers/tptimer.cpp)
+        ../helpers/tptimer.cpp
+        ../helpers/utils.cpp)
 
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11

diff --git a/Timer/Timer.cpp b/Timer/Timer.cpp
@@ -69,6 +69,8 @@ namespace WPEFramework
             LOGINFO();
             Timer::_instance = this;
 
+            Utils::IARM::init();
+
             registerMethod(TIMER_METHOD_START_TIMER, &Timer::startTimerWrapper, this);
             registerMethod(TIMER_METHOD_CANCEL, &Timer::cancelWrapper, this);
             registerMethod(TIMER_METHOD_SUSPEND, &Timer::suspendWrapper, this);

diff --git a/WebKitBrowser/InjectedBundle/CMakeLists.txt b/WebKitBrowser/InjectedBundle/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(securityagent QUIET)
 
 option(PLUGIN_AMAZON_HAWAII "Enable the Amazon Player interface (Hawaii) in javascript." OFF)
-option(PLUGIN_SECURITY_AGENT "Enable the Security Agent Features interface in javascript." OFF)
+option(PLUGIN_SECURITYAGENT "Enable the Security Agent Features interface in javascript." OFF)
 option(PLUGIN_WEBKITBROWSER_AAMP_JSBINDINGS "Enable AAMP JS bindings." OFF)
 option(PLUGIN_WEBKITBROWSER_BADGER_BRIDGE "Enable $badger support." OFF)
 

diff --git a/amlogic.cmake b/amlogic.cmake
@@ -113,14 +113,14 @@ if (BUILD_LLAMA)
     add_definitions (-DHAS_FRONT_PANEL)
     option(HAS_FRONT_PANEL "HAS_FRONT_PANEL" ON)
     add_definitions (-DENABLE_FRONT_PANEL_API_V4)
-    #add_definitions (-DHAS_STATE_OBSERVER)
+    #add_definitions (-DPLUGIN_STATEOBSERVER)
     add_definitions (-DUSE_DS)
     add_definitions (-DENABLE_GET_SET_APIVERSION)
     add_definitions (-DUSE_UPNP_DISCOVERY)
     add_definitions (-DUSE_TR_69)
     add_definitions (-DENABLE_VREX_SERVICE)
     add_definitions (-DRF4CE_API)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DPLUGIN_STATEOBSERVER)
 endif()
 
 if(SCREEN_CAPTURE)

diff --git a/broadcom.cmake b/broadcom.cmake
@@ -99,7 +99,7 @@ if (BUILD_XG1)
     add_definitions (-DBUILD_XG1)
 
     add_definitions (-DUSE_LSB)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DDONT_SET_POWER_BRIGHTNESS)
     add_definitions (-DUSE_COMMON_XG1_XI3)
     add_definitions (-DHAS_FRONT_PANEL)
@@ -170,7 +170,7 @@ if (BUILD_XG1V3)
     add_definitions (-DUSE_UPNP_DISCOVERY)
     add_definitions (-DDONT_SET_POWER_BRIGHTNESS)
     add_definitions (-DUSE_LSB)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DENABLE_VREX_SERVICE)
     #add_definitions (-DENABLE_UPDATE_MANAGER_SERVICE)
     add_definitions (-DENABLE_REMOTE_ACTION_MAPPING_SERVICE)
@@ -213,7 +213,7 @@ if (BUILD_XG2)
 
     add_definitions (-DDONT_SET_POWER_BRIGHTNESS)
     add_definitions (-DUSE_LSB)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DENABLE_VREX_SERVICE)
     #add_definitions (-DENABLE_UPDATE_MANAGER_SERVICE)
     add_definitions (-DENABLE_REMOTE_ACTION_MAPPING_SERVICE)
@@ -278,14 +278,14 @@ if (BUILD_XI3)
     add_definitions (-DHAS_FRONT_PANEL)
     option(HAS_FRONT_PANEL "HAS_FRONT_PANEL" ON)
     add_definitions (-DENABLE_FRONT_PANEL_API_V4)
-    #add_definitions (-DHAS_STATE_OBSERVER)
+    #add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DUSE_DS)
     add_definitions (-DENABLE_GET_SET_APIVERSION)
     add_definitions (-DUSE_UPNP_DISCOVERY)
     add_definitions (-DUSE_TR_69)
     add_definitions (-DENABLE_VREX_SERVICE)
     add_definitions (-DRF4CE_API)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
 endif()
 
 if(SCREEN_CAPTURE)

diff --git a/intel.cmake b/intel.cmake
@@ -89,7 +89,7 @@ if (BUILD_X1)
     add_definitions (-DRF4CE_API)
     add_definitions (-DUSE_IARM)
     add_definitions (-DHAS_SNAG_AUDIO)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DENABLE_SERVICEPROXY_SYSTEM3_SYSTEM4)
     add_definitions (-DENABLE_MSOPAIRING_4)
     add_definitions (-DENABLE_MSOPAIRING_5)

diff --git a/raspberrypi.cmake b/raspberrypi.cmake
@@ -37,7 +37,7 @@ add_definitions (-DHAS_API_DOWNLOADS)
     add_definitions (-DENABLE_GET_SET_APIVERSION)
     add_definitions (-DUSE_UPNP_DISCOVERY)
     add_definitions (-DUSE_TR_69)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
 
 # Enabling image caching for all broadcom devices
 add_definitions (-DHAS_API_DEVICEPROVISIONING)

diff --git a/realtek.cmake b/realtek.cmake
@@ -118,14 +118,14 @@ if (BUILD_XI1)
     add_definitions (-DHAS_FRONT_PANEL)
     option(HAS_FRONT_PANEL "HAS_FRONT_PANEL" ON)
     add_definitions (-DENABLE_FRONT_PANEL_API_V4)
-    #add_definitions (-DHAS_STATE_OBSERVER)
+    #add_definitions (-DDPLUGIN_STATEOBSERVER)
     add_definitions (-DUSE_DS)
     add_definitions (-DENABLE_GET_SET_APIVERSION)
     add_definitions (-DUSE_UPNP_DISCOVERY)
     add_definitions (-DUSE_TR_69)
     add_definitions (-DENABLE_VREX_SERVICE)
     add_definitions (-DRF4CE_API)
-    add_definitions (-DHAS_STATE_OBSERVER)
+    add_definitions (-DDPLUGIN_STATEOBSERVER)
 endif()
 
 if(SCREEN_CAPTURE)

diff --git a/services.cmake b/services.cmake
@@ -20,8 +20,8 @@
 #
 #add_definitions (-DENABLE_MEMORYINFO_SERVICE)
 
-add_definitions (-DWAREHOUSE_API)
-option(WAREHOUSE_API "WAREHOUSE_API" ON)
+add_definitions (-DPLUGIN_WAREHOUSE)
+option(PLUGIN_WAREHOUSE "PLUGIN_WAREHOUSE" ON)
 
 #add_definitions (-DBROWSER_SETTINGS)
 #add_definitions (-DSCREEN_CAPTURE)
@@ -53,39 +53,39 @@ option(HAS_API_APPLICATION "HAS_API_APPLICATION" ON)
 #add_definitions (-DHAS_API_HDCP_COMPLIANCE)
 #add_definitions (-DHAS_API_DATA_CAPTURE)
 
-add_definitions (-DHAS_API_COPILOT)
-option(HAS_API_COPILOT "HAS_API_COPILOT" OFF)
+add_definitions (-DPLUGIN_COPILOT)
+option(PLUGIN_COPILOT "PLUGIN_COPILOT" OFF)
 
-add_definitions (-DHAS_API_FRAME_RATE)
-option(HAS_API_FRAME_RATE "HAS_API_FRAME_RATE" ON)
+add_definitions (-DPLUGIN_FRAMERATE)
+option(PLUGIN_FRAMERATE "PLUGIN_FRAMERATE" ON)
 
-add_definitions (-DHAS_API_WEBSOCKET_PROXY)
-option(HAS_API_WEBSOCKET_PROXY "HAS_API_WEBSOCKET_PROXY" OFF)
+add_definitions (-DPLUGIN_WEBSOCKETPROXY)
+option(PLUGIN_WEBSOCKETPROXY "PLUGIN_WEBSOCKETPROXY" OFF)
 
-add_definitions (-DHAS_API_SCREEN_CAPTURE)
+add_definitions (-DPLUGIN_SCREENCAPTURE)
 
-add_definitions (-DHAS_API_STORAGE_MANAGER)
-option(HAS_API_STORAGE_MANAGER "HAS_API_STORAGE_MANAGER" OFF)
+add_definitions (-DPLUGIN_STORAGE_MANAGER)
+option(PLUGIN_STORAGE_MANAGER "PLUGIN_STORAGE_MANAGER" OFF)
 
 #add_definitions (-DHAS_API_INTRUSION_DETECTION)
 #add_definitions (-DHAS_API_LINEAR_SEGMENTED_ADVERTISING)
 #add_definitions (-DHAS_API_VIDEO_APPLICATION_EVENTS)
 #add_definitions (-DENABLE_GET_PROGRESS_BYPASS)
 #add_definitions (-DENABLE_RDK_BROWSER2)
 
-add_definitions (-DHAS_API_DEVICEDIAGNOSTICS)
-option(HAS_API_DEVICEDIAGNOSTICS "HAS_API_DEVICEDIAGNOSTICS" ON)
+add_definitions (-DPLUGIN_DEVICEDIAGNOSTICS)
+option(PLUGIN_DEVICEDIAGNOSTICS "PLUGIN_DEVICEDIAGNOSTICS" ON)
 
 #add_definitions (-DHAS_API_DEVICEPROVISIONING)
 
-add_definitions (-DHAS_API_SOUND)
-option(HAS_API_SOUND "HAS_API_SOUND" OFF)
+add_definitions (-DPLUGIN_SOUNDPLAYER)
+option(PLUGIN_SOUNDPLAYER "PLUGIN_SOUNDPLAYER" OFF)
 
 add_definitions (-DENABLE_HDCP_PROFILE)
 option(ENABLE_HDCP_PROFILE "ENABLE_HDCP_PROFILE" ON)
 
-add_definitions (-DHAS_ACTIVITY_MONITOR)
-option(HAS_ACTIVITY_MONITOR "HAS_ACTIVITY_MONITOR" ON)
+add_definitions (-DPLUGIN_ACTIVITYMONITOR)
+option(PLUGIN_ACTIVITYMONITOR "PLUGIN_ACTIVITYMONITOR" ON)
 
 #add_definitions (-DCLIENT_VERSION_STRING)=\\\"$(VERSION_FULL_VALUE)\\\"
 #add_definitions (-DSTB_VERSION_STRING)=\\\"$(FULL_VERSION_NAME_VALUE)\\\"
@@ -94,10 +94,10 @@ option(HAS_ACTIVITY_MONITOR "HAS_ACTIVITY_MONITOR" ON)
 #add_definitions (-DHAS_API_TTSSETTINGSSERVICE)
 #add_definitions (-DHAS_API_TTSSESSIONSERVICE)
 #add_definitions (-DHAS_API_TTSRESOURCESERVICE)
-add_definitions (-DHAS_API_CONTINUE_WATCHING)
-option(HAS_API_CONTINUE_WATCHING "HAS_API_CONTINUE_WATCHING" ON)
+add_definitions (-DPLUGIN_CONTINUEWATCHING)
+option(PLUGIN_CONTINUEWATCHING "PLUGIN_CONTINUEWATCHING" ON)
 
-if(HAS_API_CONTINUE_WATCHING)
+if(PLUGIN_CONTINUEWATCHING)
     if(CONTINUEWATCHING_DISABLE_SECAPI)
         add_definitions (-DDISABLE_SECAPI)
     endif()
@@ -118,19 +118,19 @@ add_definitions (-DENABLE_SYSTEM_15)
 add_definitions (-DENABLE_SYSTEM_16)
 add_definitions (-DENABLE_SYSTEM_17)
 
-add_definitions (-DHAS_STATE_OBSERVER)
-option(HAS_STATE_OBSERVER "HAS_STATE_OBSERVER" ON)
+add_definitions (-DPLUGIN_STATEOBSERVER)
+option(PLUGIN_STATEOBSERVER "PLUGIN_STATEOBSERVER" ON)
 
 if (ENABLE_XCAST_PLUGIN)
     message("Enabling Xcast plugin")
-    add_definitions (-DHAS_API_XCASTSERVICE)
-    option(HAS_API_XCASTSERVICE "HAS_API_XCASTSERVICE" OFF)
+    add_definitions (-DPLUGIN_XCAST)
+    option(PLUGIN_XCAST "PLUGIN_XCAST" OFF)
 endif()
 
 add_definitions (-DDISABLE_WEBKIT_WIDGETS)
 
-add_definitions (-DENABLE_DEVICE_PROVISIONING)
-option(DEVICE_PROVISIONING "DEVICE_PROVISIONING" OFF)
+add_definitions (-DPLUGIN_DEVICE_PROVISIONING)
+option(PLUGIN_DEVICE_PROVISIONING "PLUGIN_DEVICE_PROVISIONING" OFF)
 
 if (ENABLE_BLUETOOTH_CONTROL)
     message("Building with Bluetooth support")
@@ -140,7 +140,7 @@ if (ENABLE_BLUETOOTH_CONTROL)
 endif()
 
 message("Building with DataCapture support")
-option(PLUGIN_DATA_CAPTURE "Include DataCapture plugin" OFF)
+option(PLUGIN_DATACAPTURE "Include DataCapture plugin" OFF)
 
 if(BUILD_ENABLE_TSB)
     message("Building with TSB")