Update per comments

Author: lazarkov

examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.cpp

@@ -205,3 +205,15 @@ uint32_t ContentLauncherManager::GetFeatureMap(chip::EndpointId endpoint)
     Attributes::FeatureMap::Get(endpoint, &featureMap);
     return featureMap;
 }
+
+uint16_t ContentLauncherManager::GetClusterRevision(chip::EndpointId endpoint)
+{
+    if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT)
+    {
+        return mDynamicClusterRevision;
+    }
+
+    uint16_t clusterRevision = 0;
+    Attributes::ClusterRevision::Get(endpoint, &clusterRevision);
+    return clusterRevision;
+}

examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h

@@ -54,6 +54,7 @@ class ContentLauncherManager : public ContentLauncherDelegate
     uint32_t HandleGetSupportedStreamingProtocols() override;
 
     uint32_t GetFeatureMap(chip::EndpointId endpoint) override;
+    uint16_t GetClusterRevision(chip::EndpointId endpoint) override;
 
 protected:
     std::list<std::string> mAcceptHeaderList;
@@ -63,4 +64,5 @@ class ContentLauncherManager : public ContentLauncherDelegate
 private:
     // TODO: set this based upon meta data from app
     uint32_t mDynamicEndpointFeatureMap = 3;
+    uint16_t mDynamicClusterRevision = 2;
 };

src/app/clusters/account-login-server/account-login-server.cpp

@@ -29,7 +29,9 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/EventLogging.h>
+#include <app/data-model/Encode.h>
 #include <app/util/af.h>
+#include <app/util/attribute-storage.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 

src/app/clusters/content-launch-server/content-launch-delegate.h

@@ -54,6 +54,7 @@ class Delegate
 
     bool HasFeature(chip::EndpointId endpoint, Feature feature);
     virtual uint32_t GetFeatureMap(chip::EndpointId endpoint) = 0;
+    virtual uint16_t GetClusterRevision(chip::EndpointId endpoint) = 0;
 
     virtual ~Delegate() = default;
 };

src/app/clusters/content-launch-server/content-launch-server.cpp

@@ -130,6 +130,7 @@ class ContentLauncherAttrAccess : public app::AttributeAccessInterface
     CHIP_ERROR ReadAcceptHeaderAttribute(app::AttributeValueEncoder & aEncoder, Delegate * delegate);
     CHIP_ERROR ReadSupportedStreamingProtocolsAttribute(app::AttributeValueEncoder & aEncoder, Delegate * delegate);
     CHIP_ERROR ReadFeatureFlagAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, Delegate * delegate);
+    CHIP_ERROR ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder, Delegate * delegate);
 };
 
 ContentLauncherAttrAccess gContentLauncherAttrAccess;
@@ -165,6 +166,14 @@ CHIP_ERROR ContentLauncherAttrAccess::Read(const app::ConcreteReadAttributePath
 
         return ReadFeatureFlagAttribute(endpoint, aEncoder, delegate);
     }
+    case app::Clusters::ContentLauncher::Attributes::ClusterRevision::Id: {
+        if (isDelegateNull(delegate, endpoint))
+        {
+            return CHIP_NO_ERROR;
+        }
+
+        return ReadRevisionAttribute(endpoint, aEncoder, delegate);
+    }
     default: {
         break;
     }
@@ -192,6 +201,13 @@ CHIP_ERROR ContentLauncherAttrAccess::ReadSupportedStreamingProtocolsAttribute(a
     return aEncoder.Encode(streamingProtocols);
 }
 
+CHIP_ERROR ContentLauncherAttrAccess::ReadRevisionAttribute(EndpointId endpoint, app::AttributeValueEncoder & aEncoder,
+                                                            Delegate * delegate)
+{
+    uint16_t clusterRevision = delegate->GetClusterRevision(endpoint);
+    return aEncoder.Encode(clusterRevision);
+}
+
 } // anonymous namespace
 
 // -----------------------------------------------------------------------------