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 { if (!AdbBinary.tryStartServer(adbServerHost, adbServerPort)) { return emptyList()