From 296b58252095474df2b497e1f7b24b9e0d675952 Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Wed, 4 Jun 2025 13:40:42 -0400 Subject: [PATCH] android: detect amazon fire stick as a AndroidTV (#664) fixes tailscale/tailscale#16164 We weren't detecting fire stick devices as TV devices. Signed-off-by: Jonathan Nobels --- .../src/main/java/com/tailscale/ipn/ui/util/AndroidTVUtil.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/util/AndroidTVUtil.kt b/android/src/main/java/com/tailscale/ipn/ui/util/AndroidTVUtil.kt index b4265d2..4329d0f 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/util/AndroidTVUtil.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/util/AndroidTVUtil.kt @@ -13,10 +13,13 @@ import com.tailscale.ipn.UninitializedApp import com.tailscale.ipn.ui.util.AndroidTVUtil.isAndroidTV object AndroidTVUtil { + private val FEATURE_FIRETV = "amazon.hardware.fire_tv" + fun isAndroidTV(): Boolean { val pm = UninitializedApp.get().packageManager return (pm.hasSystemFeature(@Suppress("deprecation") PackageManager.FEATURE_TELEVISION) || - pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) + pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK) || + pm.hasSystemFeature(FEATURE_FIRETV)) } }