Add Android 14 support

Only tested on the Google TV Streamer for now, so the HDMI input stuff may need further tweaking once this actually rolls out to things with HDMI inputs.
JeffLIrion · Oct 30, 2024 · 65fed2f · 65fed2f
1 parent ac4b909
commit 65fed2f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 42 deletions.
diff --git a/androidtv/basetv/basetv.py b/androidtv/basetv/basetv.py
@@ -134,17 +134,15 @@ def _cmd_audio_state(self):
         if constants.CUSTOM_AUDIO_STATE in self._custom_commands:
             return self._custom_commands[constants.CUSTOM_AUDIO_STATE]
 
-        # Is this an Android 11 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "11":
-            return constants.CMD_AUDIO_STATE11
-
-        # Is this an Android 12 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "12":
+        # Is this an Android 11-14 device?
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "11",
+            "12",
+            "13",
+            "14",
+        ]:
             return constants.CMD_AUDIO_STATE11
 
-        # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
-            return constants.CMD_AUDIO_STATE11
         return constants.CMD_AUDIO_STATE
 
     def _cmd_current_app(self):
@@ -175,8 +173,11 @@ def _cmd_current_app(self):
         if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "12":
             return constants.CMD_CURRENT_APP12
 
-        # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
+        # Is this an Android 13/14 device?
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "13",
+            "14",
+        ]:
             return constants.CMD_CURRENT_APP13
 
         return constants.CMD_CURRENT_APP
@@ -201,7 +202,7 @@ def _cmd_current_app_media_session_state(self):
         ):
             return constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE_GOOGLE_TV
 
-        # Is this an Android 11 device?
+        # Is this an Android 11-14 device?
         if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "11":
             return constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE11
 
@@ -210,7 +211,10 @@ def _cmd_current_app_media_session_state(self):
             return constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE12
 
         # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "13",
+            "14",
+        ]:
             return constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE13
 
         return constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE
@@ -227,16 +231,13 @@ def _cmd_hdmi_input(self):
         if constants.CUSTOM_HDMI_INPUT in self._custom_commands:
             return self._custom_commands[constants.CUSTOM_HDMI_INPUT]
 
-        # Is this an Android 11 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "11":
-            return constants.CMD_HDMI_INPUT11
-
-        # Is this an Android 12 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "12":
-            return constants.CMD_HDMI_INPUT11
-
-        # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
+        # Is this an Android 11-14 device?
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "11",
+            "12",
+            "13",
+            "14",
+        ]:
             return constants.CMD_HDMI_INPUT11
 
         return constants.CMD_HDMI_INPUT
@@ -255,16 +256,13 @@ def _cmd_volume_set(self, new_volume):
             The device-specific ADB shell command used to set volume
 
         """
-        # Is this an Android 11 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "11":
-            return constants.CMD_VOLUME_SET_COMMAND11.format(new_volume)
-
-        # Is this an Android 12 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "12":
-            return constants.CMD_VOLUME_SET_COMMAND11.format(new_volume)
-
-        # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
+        # Is this an Android 11-14 device?
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "11",
+            "12",
+            "13",
+            "14",
+        ]:
             return constants.CMD_VOLUME_SET_COMMAND11.format(new_volume)
 
         return constants.CMD_VOLUME_SET_COMMAND.format(new_volume)
@@ -305,8 +303,11 @@ def _cmd_launch_app(self, app):
         if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "12":
             return constants.CMD_LAUNCH_APP12.format(app)
 
-        # Is this an Android 13 device?
-        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") == "13":
+        # Is this an Android 13-14 device?
+        if self.DEVICE_ENUM == constants.DeviceEnum.ANDROIDTV and self.device_properties.get("sw_version", "") in [
+            "13",
+            "14",
+        ]:
             return constants.CMD_LAUNCH_APP13.format(app)
 
         return constants.CMD_LAUNCH_APP.format(app)

diff --git a/androidtv/constants.py b/androidtv/constants.py
@@ -74,9 +74,9 @@ class DeviceEnum(IntEnum):
 #: Get the audio state
 CMD_AUDIO_STATE = r"dumpsys audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')"
 
-#: Get the audio state for an Android 11 device
+#: Get the audio state for an Android 11+ device
 CMD_AUDIO_STATE11 = (
-    "CURRENT_AUDIO_STATE=$(dumpsys audio | sed -r -n '/[0-9]{2}-[0-9]{2}.*player piid:.*state:.*$/h; ${x;p;}') && "
+    "CURRENT_AUDIO_STATE=$(dumpsys audio | sed -r -n '/[0-9]{2}-[0-9]{2}.*player piid:.*(state|event):(started|paused|stopped).*$/h; ${x;p;}') && "
     + r"echo $CURRENT_AUDIO_STATE | grep -q paused && echo -e '1\c' || { echo $CURRENT_AUDIO_STATE | grep -q started && echo '2\c' || echo '0\c' ; }"
 )
 
@@ -86,7 +86,7 @@ class DeviceEnum(IntEnum):
 #: Parse current application identifier from dumpsys output and assign it to ``CURRENT_APP`` variable (assumes dumpsys output is momentarily set to ``CURRENT_APP`` variable)
 CMD_PARSE_CURRENT_APP = "CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\\}*}"
 
-#: Parse current application for an Android 11 device
+#: Parse current application for an Android 11+ device
 CMD_PARSE_CURRENT_APP11 = "CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP##* }"
 #: Assign focused application identifier to ``CURRENT_APP`` variable
 CMD_DEFINE_CURRENT_APP_VARIABLE = (
@@ -103,7 +103,7 @@ class DeviceEnum(IntEnum):
     + CMD_PARSE_CURRENT_APP11
 )
 
-#: Assign focused application identifier to ``CURRENT_APP`` variable for an Android 13 device
+#: Assign focused application identifier to ``CURRENT_APP`` variable for an Android 13+ device
 CMD_DEFINE_CURRENT_APP_VARIABLE13 = (
     "CURRENT_APP=$(dumpsys window windows | grep -E -m 1 'imeLayeringTarget|imeInputTarget|imeControlTarget') && "
     + CMD_PARSE_CURRENT_APP11
@@ -118,7 +118,7 @@ class DeviceEnum(IntEnum):
 #: Output identifier for current/focused application for an Android 12 device
 CMD_CURRENT_APP12 = CMD_DEFINE_CURRENT_APP_VARIABLE12 + " && echo $CURRENT_APP"
 
-#: Output identifier for current/focused application for an Android 13 device
+#: Output identifier for current/focused application for an Android 13+ device
 CMD_CURRENT_APP13 = CMD_DEFINE_CURRENT_APP_VARIABLE13 + " && echo $CURRENT_APP"
 
 #: Assign focused application identifier to ``CURRENT_APP`` variable (for a Google TV device)
@@ -132,7 +132,7 @@ class DeviceEnum(IntEnum):
 #: set volume
 CMD_VOLUME_SET_COMMAND = "media volume --show --stream 3 --set {}"
 
-#: set volume for an Android 11 & 12 & 13 device
+#: set volume for an Android 11+ device
 CMD_VOLUME_SET_COMMAND11 = "cmd media_session volume --show --stream 3 --set {}"
 
 #: Get the HDMI input

diff --git a/tests/test_constants.py b/tests/test_constants.py
@@ -71,7 +71,7 @@ def test_constants(self):
         # CMD_AUDIO_STATE11
         self.assertCommand(
             constants.CMD_AUDIO_STATE11,
-            r"CURRENT_AUDIO_STATE=$(dumpsys audio | sed -r -n '/[0-9]{2}-[0-9]{2}.*player piid:.*state:.*$/h; ${x;p;}') && echo $CURRENT_AUDIO_STATE | grep -q paused && echo -e '1\c' || { echo $CURRENT_AUDIO_STATE | grep -q started && echo '2\c' || echo '0\c' ; }",
+            r"CURRENT_AUDIO_STATE=$(dumpsys audio | sed -r -n '/[0-9]{2}-[0-9]{2}.*player piid:.*(state|event):(started|paused|stopped).*$/h; ${x;p;}') && echo $CURRENT_AUDIO_STATE | grep -q paused && echo -e '1\c' || { echo $CURRENT_AUDIO_STATE | grep -q started && echo '2\c' || echo '0\c' ; }",
         )
 
         # CMD_AWAKE