Enable Homekit remote support for devices without play/pause (#37180)

* Enable Homekit remote support for devices without play/pause

* linting

* Update tests

* code review

* code review

homeassistant/components/homekit/type_media_players.py

@@ -260,13 +260,11 @@ class TelevisionMediaPlayer(HomeAccessory):
 
         self.sources = []
 
-        # Add additional characteristics if volume or input selection supported
+        self.chars_tv = [CHAR_REMOTE_KEY]
-        self.chars_tv = []
         self.chars_speaker = []
         features = state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
 
-        if features & (SUPPORT_PLAY | SUPPORT_PAUSE):
+        self._supports_play_pause = features & (SUPPORT_PLAY | SUPPORT_PAUSE)
-            self.chars_tv.append(CHAR_REMOTE_KEY)
         if features & SUPPORT_VOLUME_MUTE or features & SUPPORT_VOLUME_STEP:
             self.chars_speaker.extend(
                 (CHAR_NAME, CHAR_ACTIVE, CHAR_VOLUME_CONTROL_TYPE, CHAR_VOLUME_SELECTOR)
@@ -285,10 +283,9 @@ class TelevisionMediaPlayer(HomeAccessory):
             CHAR_ACTIVE, setter_callback=self.set_on_off
         )
 
-        if CHAR_REMOTE_KEY in self.chars_tv:
+        self.char_remote_key = serv_tv.configure_char(
-            self.char_remote_key = serv_tv.configure_char(
+            CHAR_REMOTE_KEY, setter_callback=self.set_remote_key
-                CHAR_REMOTE_KEY, setter_callback=self.set_remote_key
+        )
-            )
 
         if CHAR_VOLUME_SELECTOR in self.chars_speaker:
             serv_speaker = self.add_preload_service(
@@ -382,7 +379,7 @@ class TelevisionMediaPlayer(HomeAccessory):
             _LOGGER.warning("%s: Unhandled key press for %s", self.entity_id, value)
             return
 
-        if key_name == KEY_PLAY_PAUSE:
+        if key_name == KEY_PLAY_PAUSE and self._supports_play_pause:
             # Handle Play Pause by directly updating the media player entity.
             state = self.hass.states.get(self.entity_id).state
             if state in (STATE_PLAYING, STATE_PAUSED):
@@ -394,7 +391,7 @@ class TelevisionMediaPlayer(HomeAccessory):
             params = {ATTR_ENTITY_ID: self.entity_id}
             self.call_service(DOMAIN, service, params)
         else:
-            # Other keys can be handled by listening to the event bus
+            # Unhandled keys can be handled by listening to the event bus
             self.hass.bus.fire(
                 EVENT_HOMEKIT_TV_REMOTE_KEY_PRESSED,
                 {ATTR_KEY_NAME: key_name, ATTR_ENTITY_ID: self.entity_id},

tests/components/homekit/test_type_media_players.py

@@ -3,6 +3,7 @@
 from homeassistant.components.homekit.const import (
     ATTR_KEY_NAME,
     ATTR_VALUE,
+    CHAR_REMOTE_KEY,
     CONF_FEATURE_LIST,
     EVENT_HOMEKIT_TV_REMOTE_KEY_PRESSED,
     FEATURE_ON_OFF,
@@ -377,7 +378,7 @@ async def test_media_player_television_basic(hass, hk_driver, events, caplog):
     await acc.run_handler()
     await hass.async_block_till_done()
 
-    assert acc.chars_tv == []
+    assert acc.chars_tv == [CHAR_REMOTE_KEY]
     assert acc.chars_speaker == []
     assert acc.support_select_source is False
 
@@ -448,7 +449,7 @@ async def test_tv_restore(hass, hk_driver, events):
         hass, hk_driver, "MediaPlayer", "media_player.simple", 2, None
     )
     assert acc.category == 31
-    assert acc.chars_tv == []
+    assert acc.chars_tv == [CHAR_REMOTE_KEY]
     assert acc.chars_speaker == []
     assert acc.support_select_source is False
     assert not hasattr(acc, "char_input_source")
@@ -457,7 +458,7 @@ async def test_tv_restore(hass, hk_driver, events):
         hass, hk_driver, "MediaPlayer", "media_player.all_info_set", 2, None
     )
     assert acc.category == 31
-    assert acc.chars_tv == ["RemoteKey"]
+    assert acc.chars_tv == [CHAR_REMOTE_KEY]
     assert acc.chars_speaker == [
         "Name",
         "Active",