diff --git a/app/build.gradle b/app/build.gradle index ef07bd9e78..736d728ba2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -215,7 +215,7 @@ android { jniLibs { useLegacyPackaging = true pickFirsts += ['**/libtermux.so'] - excludes += ['**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] + excludes += ['**/libproot.so', '**/libproot-loader.so', '**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] } } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index d1e8a977d8..f612477f33 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -13,7 +13,6 @@ import android.widget.FrameLayout import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime -import com.droiddeck.launcher.session.SessionDisplay import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState @@ -179,9 +178,10 @@ class DroidDeckHudHost(context: Context) { private fun applyShown() { if (!running) return - val show = !hidden && !backgrounded && SessionState.mode != SessionService.MODE_DESKTOP - view?.visibility = if (show) View.VISIBLE else View.GONE - showing = show + val show = !hidden && !backgrounded + val visible = show && SessionState.mode != SessionService.MODE_DESKTOP + view?.visibility = if (visible) View.VISIBLE else View.GONE + showing = visible if (show != polling) { polling = show if (show) Choreographer.getInstance().postFrameCallback(frameCallback) @@ -215,9 +215,7 @@ class DroidDeckHudHost(context: Context) { }.getOrNull() private fun sessionResolution(): String { - val panel = SessionDisplay.panelSize(context) - val choice = SessionPrefs.resolutionChoice(context, SessionState.mode, panel) - val (width, height) = SessionDisplay.resolveChoice(panel, choice) + val (width, height) = SessionState.outputSize return "${width}x${height}" } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt index bea6ce30e7..efee19cd2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt @@ -65,7 +65,7 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: private fun externalCpuTemp(): Int? { val file = File(Environment.getExternalStorageDirectory(), "DroidDeck/cpu-temp") if (!file.isFile || System.currentTimeMillis() - file.lastModified() > CPU_TEMP_FRESH_MS) return null - return readFloat(file)?.roundToInt()?.takeIf { it in -20..150 } + return readFloat(file)?.takeIf { it.isFinite() && it in -20f..150f }?.roundToInt() } fun gpuPercent(): Int? { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index d16a372ac6..b55002cec5 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -252,7 +252,10 @@ class LinuxNetworkLinkComponent( } private fun localDnsServers(): List { + val active = connectivity.activeNetwork?.let { connectivity.getNetworkCapabilities(it) } + if (active?.hasTransport(NetworkCapabilities.TRANSPORT_VPN) == true) return emptyList() val servers = LinkedHashSet() + val gateways = LinkedHashSet() for (network in connectivity.allNetworks) { val capabilities = connectivity.getNetworkCapabilities(network) ?: continue if (!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) continue @@ -265,14 +268,12 @@ class LinuxNetworkLinkComponent( } link.routes.firstOrNull { it.isDefaultRoute }?.gateway?.let { gateway -> if (gateway is Inet4Address && !gateway.isLoopbackAddress && !gateway.isAnyLocalAddress) { - gateway.hostAddress?.substringBefore('%')?.let { servers.add(it) } + gateway.hostAddress?.substringBefore('%')?.let { gateways.add(it) } } } } - return servers.sortedWith(compareBy( - { if (it.startsWith("192.168.") || it.startsWith("10.")) 0 else 1 }, - { if (it.contains(':')) 1 else 0 }, - )).take(6) + val order = compareBy({ if (it.contains(':')) 1 else 0 }) + return servers.sortedWith(order) + gateways.sortedWith(order) } private fun writeResolver(properties: LinkProperties?) { @@ -280,7 +281,7 @@ class LinuxNetworkLinkComponent( .filter { !it.isLinkLocalAddress && !it.isLoopbackAddress && !it.isAnyLocalAddress } .sortedBy { if (it is Inet4Address) 0 else 1 } .mapNotNull { it.hostAddress?.substringBefore('%') } - val servers = (localDnsServers() + own + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888")).distinct().take(6) + val servers = (own + localDnsServers() + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888")).distinct().take(6) val text = buildString { append("# Written by the app from the device's active network; edits are overwritten.\n") for (server in servers) append("nameserver $server\n") diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 1f39eeb231..01cbf93224 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -63,8 +63,6 @@ public final class LinuxRuntime { private static final String HOST_DIR = "opt/android-host"; public static final String PROOT_PACK = "add-on pack"; - public static final String PROOT_PACKAGED = "packaged"; - /** Termux's unpatched proot inside the rootfs. Developer switch only. */ public static final String PROOT_ROOTFS = "rootfs fallback"; public static final String PROOT_MISSING = "missing"; @@ -80,31 +78,17 @@ public final class LinuxRuntime { return rootfsProot(context).isFile() && rootfsLoader(context).isFile(); } - private static File packagedProot(Context context) { - return new File(context.getApplicationInfo().nativeLibraryDir, "libproot.so"); - } - - private static File packagedLoader(Context context) { - return new File(context.getApplicationInfo().nativeLibraryDir, "libproot-loader.so"); - } - - private static boolean packagedProotReady(Context context) { - return packagedProot(context).isFile() && packagedLoader(context).isFile(); - } - public static boolean patchedProot(Context context) { - return packagedProotReady(context) || AddonPack.PROOT.installed(context); + return AddonPack.PROOT.installed(context); } public static File prootBinary(Context context) { - if (packagedProotReady(context)) return packagedProot(context); if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); if (SessionPrefs.allowStockProot(context)) return rootfsProot(context); return AddonPack.PROOT.file(context, "libproot.so"); } public static File prootLoader(Context context) { - if (packagedProotReady(context)) return packagedLoader(context); if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); if (SessionPrefs.allowStockProot(context)) return rootfsLoader(context); return AddonPack.PROOT.file(context, "libproot-loader.so"); @@ -113,8 +97,6 @@ public final class LinuxRuntime { public static String prootSource(Context context) { File bin = prootBinary(context); if (!bin.isFile()) return PROOT_MISSING; - if (packagedProotReady(context) - && bin.getPath().equals(packagedProot(context).getPath())) return PROOT_PACKAGED; if (AddonPack.PROOT.installed(context) && bin.getPath().equals(AddonPack.PROOT.file(context, "libproot.so").getPath())) return PROOT_PACK; return PROOT_ROOTFS; @@ -126,7 +108,7 @@ public final class LinuxRuntime { } public static boolean isInstalled(Context context) { - return hasRootfs(context) && (packagedProotReady(context) || patchedProot(context) || rootfsProotReady(context)); + return hasRootfs(context) && (patchedProot(context) || rootfsProotReady(context)); } public static boolean hasRootfs(Context context) { diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 56232a694d..d3af069caf 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3620,4 +3620,7 @@ 狀態 合作夥伴 已追蹤的遊戲 + GPU 透過 Mali 橋接 + 透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式 + 關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6d352e32e6..d9ffdfae77 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3620,4 +3620,7 @@ 狀態 合作夥伴 已追蹤的遊戲 + GPU 透過 Mali 橋接 + 透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式 + 關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU diff --git a/docs/openmali/README.md b/docs/openmali/README.md index 7c61036d39..894a556b81 100644 --- a/docs/openmali/README.md +++ b/docs/openmali/README.md @@ -107,13 +107,13 @@ - 新增 localDnsServers(),用 ConnectivityManager.allNetworks 遍历 WiFi/Ethernet 网络(排除 VPN)。 - 收集这些网络的 DNS,并把默认路由 gateway 作为本地 DNS 兜底。 - 私有地址(192.168/10.x)和 IPv4 优先。 - - writeResolver 的顺序:localDnsServers() + 当前 active network DNS + 公共 DNS 兜底。 + - writeResolver 的顺序:当前 active network DNS + localDnsServers() + 公共 DNS 兜底。 - 验证(2026-11-01,dnsfix APK): - logcat:LinuxNetworkLink: resolver: 192.168.1.1 8.8.8.8 1.1.1.1 2001:4860:4860::8888 - guest /etc/resolv.conf 第一行是 nameserver 192.168.1.1。 - getent hosts store.steampowered.com 正常;curl -I https://store.steampowered.com 返回 200。 - 旧 guest DNS 守护 /root/.config/plasma-workspace/env/01-dns-guard.sh 已删除;没有守护进程仍正常。 -- 说明:只取 WiFi/Ethernet 的本地 DNS;没有 WiFi/Ethernet 时回退到 active network/公共 DNS。VPN 的 10.10.14.1 不会被误当 DNS。 +- 说明:localDnsServers() 只取 WiFi/Ethernet 的 DNS,网关排在各 DNS 之后;active network 是 VPN 时不追加本地 DNS,只用 VPN 自己的 DNS。 ### 5.3 Steam 客户端修复 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index a44b7dba97..0c037af472 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -249,7 +249,8 @@ if [ "${BL_VKBRIDGE:-0}" = 1 ]; then fi echo "== vulkan driver: Mali bridge ($bl_vkb_icd, server at $VKBRIDGE_SOCKET)" else - echo "== vulkan driver: Mali bridge requested but NOT usable (icd $bl_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$bl_vkb_missing); this GPU will show a black screen" + echo "== vulkan driver: Mali bridge requested but NOT usable (icd $bl_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$bl_vkb_missing)" + [ -n "${BL_INSIDE:-}" ] || exit 69 fi unset bl_vkb_icd bl_vkb_missing fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents index 59bd7013d0..d7c3f61afd 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents @@ -599,11 +599,7 @@ def overrides_value(names): name = name.strip().lower() if name and re.fullmatch(r"[a-z0-9._-]+", name) and re.fullmatch(r"[nb,]*", mode): modes.pop(name, None) - mode = mode if "=" in entry else "n,b" - # dotnet40 has no native mscoree.dll; native-only would hide Wine's loader and fail IL-only apps. - if name == "mscoree" and mode == "n": - mode = "n,b" - modes[name] = mode + modes[name] = mode if "=" in entry else "n,b" return ";".join("%s=%s" % item for item in modes.items()) diff --git a/tools/tests/test_wincomponents.py b/tools/tests/test_wincomponents.py index ee4f250c70..d7686ebf16 100644 --- a/tools/tests/test_wincomponents.py +++ b/tools/tests/test_wincomponents.py @@ -261,7 +261,6 @@ class WinComponentsTest(unittest.TestCase): def test_overrides_value_last_word_wins_and_refuses_junk(self): self.assertEqual(MODULE["overrides_value"](["a", "b=n", "a=b", "bad;name", "c=x"]), "b=n;a=b") - self.assertEqual(MODULE["overrides_value"](["mscoree=n"]), "mscoree=n,b") class PendingWaitTest(unittest.TestCase):