Implement UI affordance to run cert tests from the android casting ap…

…p. (project-chip#24321) * Implement UI affordance to run cert tests from the android casting app. * Restyled by google-java-format * Restyled by clang-format * Restyled by gn Co-authored-by: Restyled.io <[email protected]>
cletnick · Jan 10, 2023 · c70f535 · c70f535
1 parent d9ccca2
commit c70f535
Show file tree

Hide file tree

Showing 24 changed files with 819 additions and 15 deletions.
diff --git a/...droid/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java b/...droid/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java
@@ -72,6 +72,10 @@ public void init(@NonNull Context context) {
     registerContentAppUpdatesReceiver();
   }
 
+  public void addSelfVendorAsAdmin() {
+    mAppPlatform.addSelfVendorAsAdmin();
+  }
+
   private void initializeContentAppEndpoints() {
 
     // Read the metadada of previously discovered endpoints.

diff --git a/...oid/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServantService.java b/...oid/App/platform-app/src/main/java/com/matter/tv/server/service/MatterServantService.java
@@ -24,6 +24,7 @@ public void onCreate() {
     MatterServant.get().initCommissioner();
 
     AppPlatformService.get().init(this.getApplicationContext());
+    AppPlatformService.get().addSelfVendorAsAdmin();
   }
 
   @Nullable

diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp
@@ -44,9 +44,11 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ZclString.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 using namespace chip;
 using namespace chip::AppPlatform;
+using namespace chip::DeviceLayer;
 
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 ContentAppFactoryImpl gFactory;
@@ -407,6 +409,20 @@ std::list<ClusterId> ContentAppFactoryImpl::GetAllowedClusterListForStaticEndpoi
 {
     if (endpointId == kLocalVideoPlayerEndpointId)
     {
+        if (GetVendorPrivilege(vendorId) == Access::Privilege::kAdminister)
+        {
+            ChipLogProgress(DeviceLayer,
+                            "ContentAppFactoryImpl GetAllowedClusterListForStaticEndpoint priviledged vendor accessible clusters "
+                            "being returned.");
+            return { chip::app::Clusters::Descriptor::Id,         chip::app::Clusters::OnOff::Id,
+                     chip::app::Clusters::WakeOnLan::Id,          chip::app::Clusters::MediaPlayback::Id,
+                     chip::app::Clusters::LowPower::Id,           chip::app::Clusters::KeypadInput::Id,
+                     chip::app::Clusters::ContentLauncher::Id,    chip::app::Clusters::AudioOutput::Id,
+                     chip::app::Clusters::ApplicationLauncher::Id };
+        }
+        ChipLogProgress(
+            DeviceLayer,
+            "ContentAppFactoryImpl GetAllowedClusterListForStaticEndpoint operator vendor accessible clusters being returned.");
         return { chip::app::Clusters::Descriptor::Id,      chip::app::Clusters::OnOff::Id,
                  chip::app::Clusters::WakeOnLan::Id,       chip::app::Clusters::MediaPlayback::Id,
                  chip::app::Clusters::LowPower::Id,        chip::app::Clusters::KeypadInput::Id,
@@ -478,3 +494,16 @@ void ReportAttributeChange(EndpointId epId, chip::ClusterId clusterId, chip::Att
 {
     MatterReportingAttributeChangeCallback(epId, clusterId, attributeId);
 }
+
+void AddSelfVendorAsAdmin()
+{
+    uint16_t value;
+    if (DeviceLayer::GetDeviceInstanceInfoProvider()->GetVendorId(value) != CHIP_NO_ERROR)
+    {
+        ChipLogDetail(Discovery, "AppImpl addSelfVendorAsAdmin Vendor ID not known");
+    }
+    else
+    {
+        gFactory.AddAdminVendorId(value);
+    }
+}
diff --git a/examples/tv-app/android/java/AppImpl.h b/examples/tv-app/android/java/AppImpl.h
@@ -60,6 +60,8 @@ EndpointId AddContentApp(const char * szVendorName, uint16_t vendorId, const cha
 EndpointId RemoveContentApp(EndpointId epId);
 void ReportAttributeChange(EndpointId epId, chip::ClusterId clusterId, chip::AttributeId attributeId);
 
+void AddSelfVendorAsAdmin();
+
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
 namespace chip {

diff --git a/examples/tv-app/android/java/AppPlatform-JNI.cpp b/examples/tv-app/android/java/AppPlatform-JNI.cpp
@@ -87,3 +87,9 @@ JNI_METHOD(void, reportAttributeChange)
     ReportAttributeChange(static_cast<EndpointId>(endpointId), static_cast<chip::ClusterId>(clusterId),
                           static_cast<chip::AttributeId>(attributeId));
 }
+
+JNI_METHOD(void, addSelfVendorAsAdmin)
+(JNIEnv *, jobject, jint endpointId, jint clusterId, jint attributeId)
+{
+    AddSelfVendorAsAdmin();
+}
diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/AppPlatform.java
@@ -55,6 +55,10 @@ public native int addContentAppAtEndpoint(
   // Method to report attribute change for content app endpoints to the SDK
   public native void reportAttributeChange(int endpointId, int clusterId, int attributeId);
 
+  // Method to add the current vendorId of the node as an admin to enable clients from same vendor
+  // to be admins
+  public native void addSelfVendorAsAdmin();
+
   static {
     System.loadLibrary("TvApp");
   }

diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp
@@ -41,6 +41,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ZclString.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 #include <zap-generated/CHIPClusters.h>
 
 using namespace chip;
@@ -502,6 +503,20 @@ std::list<ClusterId> ContentAppFactoryImpl::GetAllowedClusterListForStaticEndpoi
 {
     if (endpointId == kLocalVideoPlayerEndpointId)
     {
+        if (GetVendorPrivilege(vendorId) == Access::Privilege::kAdminister)
+        {
+            ChipLogProgress(DeviceLayer,
+                            "ContentAppFactoryImpl GetAllowedClusterListForStaticEndpoint priviledged vendor accessible clusters "
+                            "being returned.");
+            return { chip::app::Clusters::Descriptor::Id,         chip::app::Clusters::OnOff::Id,
+                     chip::app::Clusters::WakeOnLan::Id,          chip::app::Clusters::MediaPlayback::Id,
+                     chip::app::Clusters::LowPower::Id,           chip::app::Clusters::KeypadInput::Id,
+                     chip::app::Clusters::ContentLauncher::Id,    chip::app::Clusters::AudioOutput::Id,
+                     chip::app::Clusters::ApplicationLauncher::Id };
+        }
+        ChipLogProgress(
+            DeviceLayer,
+            "ContentAppFactoryImpl GetAllowedClusterListForStaticEndpoint operator vendor accessible clusters being returned.");
         return { chip::app::Clusters::Descriptor::Id,      chip::app::Clusters::OnOff::Id,
                  chip::app::Clusters::WakeOnLan::Id,       chip::app::Clusters::MediaPlayback::Id,
                  chip::app::Clusters::LowPower::Id,        chip::app::Clusters::KeypadInput::Id,
@@ -520,6 +535,15 @@ CHIP_ERROR InitVideoPlayerPlatform()
 #if CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
     ContentAppPlatform::GetInstance().SetupAppPlatform();
     ContentAppPlatform::GetInstance().SetContentAppFactory(&gFactory);
+    uint16_t value;
+    if (DeviceLayer::GetDeviceInstanceInfoProvider()->GetVendorId(value) != CHIP_NO_ERROR)
+    {
+        ChipLogDetail(Discovery, "AppImpl InitVideoPlayerPlatform Vendor ID not known");
+    }
+    else
+    {
+        gFactory.AddAdminVendorId(value);
+    }
 #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED
 
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE

diff --git a/examples/tv-casting-app/android/App/app/build.gradle b/examples/tv-casting-app/android/App/app/build.gradle
@@ -44,6 +44,10 @@ android {
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs/jniLibs']
+            java.srcDirs = [
+                    'src/main/java',
+                    'src/main/jni',
+            ]
 
             // uncomment this code to debug
 //            java.srcDirs = [