diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index e2f0b4cf98..c97ba3a861 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -86,6 +86,15 @@ object WirelessAdbFix { } }.getOrDefault(address is Inet4Address) + fun localConnectPort(context: Context): Int? = + tlsPortProperty() + ?: findConnectPort(context, LOOPBACK) + + private fun tlsPortProperty(): Int? = runCatching { + Class.forName("android.os.SystemProperties").getMethod("get", String::class.java) + .invoke(null, "service.adb.tls.port") as? String + }.getOrNull()?.trim()?.toIntOrNull()?.takeIf { it in 1..65535 } + fun findConnectPort(context: Context, pairedHost: String, timeoutSeconds: Long = 12): Int? { val manager = context.applicationContext.getSystemService(Context.NSD_SERVICE) as NsdManager val paired = runCatching { InetAddress.getByName(pairedHost) }.getOrNull() ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt index 5e4ecc51f1..cecf9add31 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt @@ -127,7 +127,7 @@ class WirelessAdbPairingService : Service() { show(Stage.Working("Paired. Connecting…")) } val result = runCatching { - val connectPort = WirelessAdbFix.findConnectPort(this, WirelessAdbFix.LOOPBACK) + val connectPort = WirelessAdbFix.localConnectPort(this) ?: error("Paired, but the Wireless debugging port was not found. Keep Wireless debugging on and try again.") main.post { show(Stage.Working("Applying the setting…")) } WirelessAdbFix.setChildProcessLimit(this, WirelessAdbFix.LOOPBACK, connectPort, false)