From 5550b1a74e62539666d5e40d6592da71a70f1ad2 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Sun, 25 Aug 2024 15:09:08 +0200
Subject: [PATCH] Only support remote activity on Alexa if feature is set and
 at least one feature is in the activity_list (#124567)

Only support remote activity on Alexa if feaure is set and at least one feature is in the activity_list
---
 homeassistant/components/alexa/entities.py  |  9 +++++---
 tests/components/alexa/test_capabilities.py | 24 +++++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/alexa/entities.py b/homeassistant/components/alexa/entities.py
index 8bba4ed2468..ca7b389a0f1 100644
--- a/homeassistant/components/alexa/entities.py
+++ b/homeassistant/components/alexa/entities.py
@@ -661,9 +661,12 @@ class RemoteCapabilities(AlexaEntity):
     def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
-        yield AlexaModeController(
-            self.entity, instance=f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}"
-        )
+        supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
+        activities = self.entity.attributes.get(remote.ATTR_ACTIVITY_LIST) or []
+        if activities and supported & remote.RemoteEntityFeature.ACTIVITY:
+            yield AlexaModeController(
+                self.entity, instance=f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}"
+            )
         yield AlexaEndpointHealth(self.hass, self.entity)
         yield Alexa(self.entity)
 
diff --git a/tests/components/alexa/test_capabilities.py b/tests/components/alexa/test_capabilities.py
index 162149f095b..b56d8054d7b 100644
--- a/tests/components/alexa/test_capabilities.py
+++ b/tests/components/alexa/test_capabilities.py
@@ -70,6 +70,7 @@ async def test_discovery_remote(
         {
             "current_activity": current_activity,
             "activity_list": activity_list,
+            "supported_features": 4,
         },
     )
     msg = await smart_home.async_handle_message(hass, get_default_config(hass), request)
@@ -790,22 +791,37 @@ async def test_report_remote_activity(hass: HomeAssistant) -> None:
     hass.states.async_set(
         "remote.unknown",
         "on",
-        {"current_activity": "UNKNOWN"},
+        {
+            "current_activity": "UNKNOWN",
+            "supported_features": 4,
+        },
     )
     hass.states.async_set(
         "remote.tv",
         "on",
-        {"current_activity": "TV", "activity_list": ["TV", "MUSIC", "DVD"]},
+        {
+            "current_activity": "TV",
+            "activity_list": ["TV", "MUSIC", "DVD"],
+            "supported_features": 4,
+        },
     )
     hass.states.async_set(
         "remote.music",
         "on",
-        {"current_activity": "MUSIC", "activity_list": ["TV", "MUSIC", "DVD"]},
+        {
+            "current_activity": "MUSIC",
+            "activity_list": ["TV", "MUSIC", "DVD"],
+            "supported_features": 4,
+        },
     )
     hass.states.async_set(
         "remote.dvd",
         "on",
-        {"current_activity": "DVD", "activity_list": ["TV", "MUSIC", "DVD"]},
+        {
+            "current_activity": "DVD",
+            "activity_list": ["TV", "MUSIC", "DVD"],
+            "supported_features": 4,
+        },
     )
 
     properties = await reported_properties(hass, "remote#unknown")