Merge pull request #1 from rdkcentral/master

Sync on 07/15/2020

AVInput/doc/AVInput.md

@@ -0,0 +1 @@
+[AVInput Docs](https://wiki.rdkcentral.com/display/RDK/AV+Input)

ActivityMonitor/doc/ActivityMonitor.md

@@ -0,0 +1 @@
+[Activity Monitor docs](https://wiki.rdkcentral.com/display/RDK/ActivityMonitor)

Bluetooth/doc/Bluetooth.md

@@ -0,0 +1,2 @@
+[Bluetooth](https://wiki.rdkcentral.com/display/RDK/Bluetooth)
+

CMakeLists.txt

@@ -46,6 +46,7 @@ option(PLUGIN_CONTROLSERVICE "Include ControlService plugin" ON)
 option(PLUGIN_VIDEOAPPLICATIONEVENTS "Include video application events plugin" OFF)
 option(PLUGIN_INACTIVITYNOTIFIER "Include InactivityNotifier plugin" OFF)
 option(PLUGIN_RDKSHELL "Include RDKShell plugin" OFF)
+option(PLUGIN_TEXTTOSPEECH "Include TextToSpeech plugin" OFF)
 
 # Library installation section
 string(TOLOWER ${NAMESPACE} STORAGE_DIRECTORY)
@@ -151,6 +152,10 @@ endif()
        add_subdirectory(HdmiCec)
     endif()
 
+    if(HAS_API_HDMI_CEC_2)
+       add_subdirectory(HdmiCec_2)
+    endif()
+
     if(ENABLE_LOCATION_SYNC)
         add_subdirectory(LocationSync)
     endif()
@@ -283,6 +288,14 @@ endif()
         add_subdirectory(WebKitBrowser)
     endif()
 
+    if(PLUGIN_TEXTTOSPEECH)
+        add_subdirectory(TextToSpeech)
+    endif()
+
+if(PLUGIN_PERSISTENT_STORE)
+    add_subdirectory(PersistentStore)
+endif()
+
 if(WPEFRAMEWORK_CREATE_IPKG_TARGETS)
     set(CPACK_GENERATOR "DEB")
     set(CPACK_DEB_COMPONENT_INSTALL ON)

ContinueWatching/doc/ContinueWatching.md

@@ -0,0 +1,2 @@
+[Continue Watching](https://wiki.rdkcentral.com/display/RDK/Continue+Watching)
+

ControlService/ControlService.cpp

@@ -72,6 +72,7 @@ namespace WPEFramework {
             ControlService::_instance = this;
 
             registerMethod("getApiVersionNumber", &ControlService::getApiVersionNumber, this);
+            registerMethod("getQuirks", &ControlService::getQuirks, this);
 
             registerMethod("getAllRemoteData", &ControlService::getAllRemoteDataWrapper, this);
             registerMethod("getSingleRemoteData", &ControlService::getSingleRemoteDataWrapper, this);
@@ -722,6 +723,15 @@ namespace WPEFramework {
             returnResponse(true);
         }
 
+        uint32_t ControlService::getQuirks(const JsonObject& parameters, JsonObject& response)
+        {
+            LOGINFOMETHOD();
+            JsonArray array;
+            array.Add("DELIA-43686");
+            response["quirks"] = array;
+            returnResponse(true);
+        }
+
         uint32_t ControlService::getAllRemoteDataWrapper(const JsonObject& parameters, JsonObject& response)
         {
             LOGINFOMETHOD();
@@ -1953,6 +1963,7 @@ namespace WPEFramework {
             remoteInfo["linkQuality"]               = JsonValue((int)ctrlStatus.status.link_quality);
             remoteInfo["bHasCheckedIn"]             = JsonValue((bool)ctrlStatus.status.checkin_for_device_update);
             remoteInfo["bIrdbDownloadSupported"]    = JsonValue((bool)ctrlStatus.status.ir_db_code_download_supported);
+            remoteInfo["securityType"]              = JsonValue((int)ctrlStatus.status.security_type);
 
             remoteInfo["bHasBattery"]                       = JsonValue((bool)ctrlStatus.status.has_battery);
             remoteInfo["batteryChangedTimestamp"]           = JsonValue((long long)(ctrlStatus.status.time_battery_changed * 1000LL));

ControlService/ControlService.h

@@ -90,6 +90,7 @@ namespace WPEFramework {
 
             //Begin methods
             uint32_t getApiVersionNumber(const JsonObject& parameters, JsonObject& response);
+            uint32_t getQuirks(const JsonObject& parameters, JsonObject& response);
 
             uint32_t getAllRemoteDataWrapper(const JsonObject& parameters, JsonObject& response);
             uint32_t getSingleRemoteDataWrapper(const JsonObject& parameters, JsonObject& response);

ControlService/doc/ControlService.md

@@ -0,0 +1,2 @@
+[Control Service](https://wiki.rdkcentral.com/display/RDK/Control+Service)
+

DataCapture/doc/DataCapture.md

@@ -0,0 +1,2 @@
+[DataCapture](https://wiki.rdkcentral.com/display/RDK/DataCapture)
+

DeviceDiagnostics/doc/DeviceDiagnostics.md

@@ -0,0 +1,2 @@
+[DeviceDiagnostics](https://wiki.rdkcentral.com/display/RDK/Device+Diagnostics)
+