Restyle fix

project-chip · Feb 9, 2022 · 6c208e9 · 6c208e9
1 parent a7b1512
commit 6c208e9
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/examples/tv-app/android/java/ContentLauncherManager.h b/examples/tv-app/android/java/ContentLauncherManager.h
@@ -39,8 +39,9 @@ class ContentLauncherManager : public ContentLauncherDelegate
     static void NewManager(jint endpoint, jobject manager);
     void InitializeWithObjects(jobject managerObject);
 
-    void HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper, const chip::app::DataModel::DecodableList<ParameterType> & parameterList,
-                             bool autoplay, const CharSpan & data) override;
+    void HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper,
+                             const chip::app::DataModel::DecodableList<ParameterType> & parameterList, bool autoplay,
+                             const CharSpan & data) override;
     void HandleLaunchUrl(CommandResponseHelper<LaunchResponseType> & helper, const CharSpan & contentUrl,
                          const CharSpan & displayString, const BrandingInformationType & brandingInformation) override;
     CHIP_ERROR HandleGetAcceptHeaderList(AttributeValueEncoder & aEncoder) override;

diff --git a/examples/tv-app/linux/args.gni b/examples/tv-app/linux/args.gni
@@ -28,4 +28,4 @@ chip_build_libshell = true
 
 chip_enable_additional_data_advertising = true
 
-chip_enable_rotating_device_id = true
+chip_enable_rotating_device_id = true
diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
@@ -31,7 +31,8 @@ ContentLauncherManager::ContentLauncherManager(list<std::string> acceptHeaderLis
 }
 
 void ContentLauncherManager::HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper,
-                                                 const DecodableList<ParameterType> & parameterList, bool autoplay, const CharSpan & data)
+                                                 const DecodableList<ParameterType> & parameterList, bool autoplay,
+                                                 const CharSpan & data)
 {
     ChipLogProgress(Zcl, "ContentLauncherManager::HandleLaunchContent for endpoint %d", mEndpointId);
     string dataString(data.data(), data.size());

diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h
@@ -35,8 +35,9 @@ class ContentLauncherManager : public ContentLauncherDelegate
     ContentLauncherManager() : ContentLauncherManager({ "example", "example" }, 0){};
     ContentLauncherManager(std::list<std::string> acceptHeaderList, uint32_t supportedStreamingProtocols);
 
-    void HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper, const chip::app::DataModel::DecodableList<ParameterType> & parameterList,
-                             bool autoplay, const CharSpan & data) override;
+    void HandleLaunchContent(CommandResponseHelper<LaunchResponseType> & helper,
+                             const chip::app::DataModel::DecodableList<ParameterType> & parameterList, bool autoplay,
+                             const CharSpan & data) override;
     void HandleLaunchUrl(CommandResponseHelper<LaunchResponseType> & helper, const CharSpan & contentUrl,
                          const CharSpan & displayString, const BrandingInformationType & brandingInformation) override;
     CHIP_ERROR HandleGetAcceptHeaderList(AttributeValueEncoder & aEncoder) override;

diff --git a/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp b/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp
@@ -17,9 +17,9 @@
  */
 
 #include "WakeOnLanManager.h"
-#include <string>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <string>
 
 using namespace chip;
 using namespace chip::app::Clusters::WakeOnLan;
@@ -34,10 +34,9 @@ std::string getMacAddress()
 
 CHIP_ERROR WakeOnLanManager::HandleGetMacAddress(chip::app::AttributeValueEncoder & aEncoder)
 {
-    #if CHIP_ENABLE_WAKE_ON_LAN
+#if CHIP_ENABLE_WAKE_ON_LAN
     return aEncoder.Encode(CharSpan::fromCharString(getMacAddress().c_str()));
-    #else
+#else
     return aEncoder.Encode(CharSpan::fromCharString("00:00:00:00:00"));
-    #endif // CHIP_ENABLE_WAKE_ON_LAN
-
-}
+#endif // CHIP_ENABLE_WAKE_ON_LAN
+}
diff --git a/src/app/clusters/content-launch-server/content-launch-delegate.h b/src/app/clusters/content-launch-server/content-launch-delegate.h
@@ -41,7 +41,8 @@ class Delegate
 {
 public:
     virtual void HandleLaunchContent(CommandResponseHelper<Commands::LaunchResponse::Type> & helper,
-                                     const DataModel::DecodableList<Parameter> & parameterList, bool autoplay, const CharSpan & data) = 0;
+                                     const DataModel::DecodableList<Parameter> & parameterList, bool autoplay,
+                                     const CharSpan & data) = 0;
 
     virtual void HandleLaunchUrl(CommandResponseHelper<Commands::LaunchResponse::Type> & helper, const CharSpan & contentUrl,
                                  const CharSpan & displayString, const BrandingInformation & brandingInformation) = 0;

diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -193,8 +193,8 @@ bool emberAfContentLauncherClusterLaunchContentRequestCallback(
     CHIP_ERROR err      = CHIP_NO_ERROR;
     EndpointId endpoint = commandPath.mEndpointId;
 
-    auto & autoplay = commandData.autoPlay;
-    auto & data     = commandData.data;
+    auto & autoplay               = commandData.autoPlay;
+    auto & data                   = commandData.data;
     auto & decodableParameterList = commandData.search.parameterList;
 
     app::CommandResponseHelper<Commands::LaunchResponse::Type> responder(commandObj, commandPath);
@@ -237,7 +237,8 @@ bool emberAfContentLauncherClusterLaunchURLRequestCallback(
     VerifyOrExit(isDelegateNull(delegate, endpoint) != true, err = CHIP_ERROR_INCORRECT_STATE);
     {
         delegate->HandleLaunchUrl(responder, contentUrl, displayString.HasValue() ? displayString.Value() : CharSpan(),
-                                  brandingInformation.HasValue() ? brandingInformation.Value() : chip::app::Clusters::ContentLauncher::BrandingInformation());
+                                  brandingInformation.HasValue() ? brandingInformation.Value()
+                                                                 : chip::app::Clusters::ContentLauncher::BrandingInformation());
     }
 
 exit:

diff --git a/src/app/tests/suites/TV_ContentLauncherCluster.yaml b/src/app/tests/suites/TV_ContentLauncherCluster.yaml
@@ -44,9 +44,17 @@ tests:
               - name: "data"
                 value: "exampleData"
               - name: "search"
-                value: 
+                value:
                     {
-                      parameterList: [{ type: 1, value: "exampleValue", externalIDList: [{ name: "name", value: "value" }]}]
+                        parameterList:
+                            [
+                                {
+                                    type: 1,
+                                    value: "exampleValue",
+                                    externalIDList:
+                                        [{ name: "name", value: "value" }],
+                                },
+                            ],
                     }
       response:
           values:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@ chip_build_libshell = true

		chip_enable_additional_data_advertising = true

		chip_enable_rotating_device_id = true
		chip_enable_rotating_device_id = true