From 2b651cd56eff9d6e7c6e43a7374fc4fe65c861b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ru=CC=84dolfs=20Bundulis?= <rudolfs.bundulis@gmail.com>
Date: Fri, 3 Jul 2026 19:00:37 +0300
Subject: [PATCH] feat: honour ANDROID_ADB_SERVER_PORT env variable

---
 dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt b/dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt
index a481f13..155718d 100644
--- a/dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt
+++ b/dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt
@@ -14,6 +14,13 @@ import java.nio.charset.StandardCharsets
 
 object AdbServer {
 
+    /**
+     * Default adb server port. Mirrors the adb CLI, which honors ANDROID_ADB_SERVER_PORT and
+     * otherwise falls back to 5037.
+     */
+    @JvmStatic
+    val DEFAULT_ADB_SERVER_PORT: Int = System.getenv("ANDROID_ADB_SERVER_PORT")?.toIntOrNull() ?: 5037
+
     /**
      * Experimental API
      *
@@ -45,7 +52,7 @@ object AdbServer {
     @JvmOverloads
     fun createDadb(
         adbServerHost: String = "localhost",
-        adbServerPort: Int = 5037,
+        adbServerPort: Int = DEFAULT_ADB_SERVER_PORT,
         deviceQuery: String = "host:transport-any",
         connectTimeout: Int = 0,
         socketTimeout: Int = 0
@@ -63,7 +70,7 @@ object AdbServer {
     @JvmOverloads
     fun listDadbs(
         adbServerHost: String = "localhost",
-        adbServerPort: Int = 5037,
+        adbServerPort: Int = DEFAULT_ADB_SERVER_PORT,
     ): List<Dadb> {
         if (!AdbBinary.tryStartServer(adbServerHost, adbServerPort)) {
             return emptyList()